r4287 - in dists/sid/linux-2.6/debian: . arch/ia64

[Dann Frazier]

Author: dannf
Date: 2005-09-26 17:17:54 +0000 (Mon, 26 Sep 2005)
New Revision: 4287

Modified:
   dists/sid/linux-2.6/debian/arch/ia64/config.itanium
   dists/sid/linux-2.6/debian/arch/ia64/config.mckinley
   dists/sid/linux-2.6/debian/changelog
Log:
* [ia64] Workaround #325070 until upstream works out an acceptable solution.
  This bug breaks module loading on non-SMP ia64 kernels.  The workaround
  is to temporarily use an SMP config for the non-SMP kernels.

Modified: dists/sid/linux-2.6/debian/arch/ia64/config.itanium
===================================================================
--- dists/sid/linux-2.6/debian/arch/ia64/config.itanium	2005-09-26 14:24:23 UTC (rev 4286)
+++ dists/sid/linux-2.6/debian/arch/ia64/config.itanium	2005-09-26 17:17:54 UTC (rev 4287)
@@ -1,18 +1,12 @@
-CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+# CONFIG_CPUSETS is not set
+CONFIG_STOP_MACHINE=y
 CONFIG_ITANIUM=y
 # CONFIG_MCKINLEY is not set
 CONFIG_IA64_BRL_EMU=y
 CONFIG_IA64_L1_CACHE_SHIFT=6
-# CONFIG_SMP is not set
-# CONFIG_MTD_XIP is not set
-# CONFIG_MKISS is not set
-# CONFIG_IRPORT_SIR is not set
-# CONFIG_PCMCIA_XIRTULIP is not set
-# CONFIG_COMPUTONE is not set
-# CONFIG_DIGIEPCA is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_RIO is not set
-# CONFIG_STALLION is not set
-# CONFIG_ISTALLION is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
+CONFIG_SMP=y
+CONFIG_NR_CPUS=64
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_SCHED_SMT is not set
+CONFIG_HAVE_DEC_LOCK=y

Modified: dists/sid/linux-2.6/debian/arch/ia64/config.mckinley
===================================================================
--- dists/sid/linux-2.6/debian/arch/ia64/config.mckinley	2005-09-26 14:24:23 UTC (rev 4286)
+++ dists/sid/linux-2.6/debian/arch/ia64/config.mckinley	2005-09-26 17:17:54 UTC (rev 4287)
@@ -1,17 +1,11 @@
-CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+# CONFIG_CPUSETS is not set
+CONFIG_STOP_MACHINE=y
 # CONFIG_ITANIUM is not set
 CONFIG_MCKINLEY=y
 CONFIG_IA64_L1_CACHE_SHIFT=7
-# CONFIG_SMP is not set
-# CONFIG_MTD_XIP is not set
-# CONFIG_MKISS is not set
-# CONFIG_IRPORT_SIR is not set
-# CONFIG_PCMCIA_XIRTULIP is not set
-# CONFIG_COMPUTONE is not set
-# CONFIG_DIGIEPCA is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_RIO is not set
-# CONFIG_STALLION is not set
-# CONFIG_ISTALLION is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
+CONFIG_SMP=y
+CONFIG_NR_CPUS=64
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_SCHED_SMT is not set
+CONFIG_HAVE_DEC_LOCK=y

Modified: dists/sid/linux-2.6/debian/changelog
===================================================================
--- dists/sid/linux-2.6/debian/changelog	2005-09-26 14:24:23 UTC (rev 4286)
+++ dists/sid/linux-2.6/debian/changelog	2005-09-26 17:17:54 UTC (rev 4287)
@@ -5,8 +5,13 @@
     in hppa.patch which causes it not to apply and the build to break.
     (closes: #330157)
 
- -- Simon Horman <horms at debian.org>  Mon, 26 Sep 2005 12:31:29 +0000
+  [ dann frazier ]
+  * [ia64] Workaround #325070 until upstream works out an acceptable solution.
+    This bug breaks module loading on non-SMP ia64 kernels.  The workaround
+    is to temporarily use an SMP config for the non-SMP kernels.
 
+ -- dann frazier <dannf at debian.org>  Mon, 26 Sep 2005 11:18:17 -0600
+
 linux-2.6 (2.6.12-9) unstable; urgency=high
 
   [ Simon Horman ]