r4308 - in dists/trunk/linux-2.6/debian: . arch/ia64 patches-debian

[Dann Frazier]

Author: dannf
Date: 2005-10-05 21:32:17 +0000 (Wed, 05 Oct 2005)
New Revision: 4308

Added:
   dists/trunk/linux-2.6/debian/patches-debian/mempolicy-check-mode.patch
Modified:
   dists/trunk/linux-2.6/debian/arch/ia64/config.itanium
   dists/trunk/linux-2.6/debian/arch/ia64/config.mckinley
   dists/trunk/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.  (Note that
  John Wright is running benchmarks to determine the overhead of running
  an SMP kernel on UP systems to help decide if this should be a
  permanent change).

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config.itanium
===================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config.itanium	2005-10-05 14:34:10 UTC (rev 4307)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config.itanium	2005-10-05 21:32:17 UTC (rev 4308)
@@ -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/trunk/linux-2.6/debian/arch/ia64/config.mckinley
===================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config.mckinley	2005-10-05 14:34:10 UTC (rev 4307)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config.mckinley	2005-10-05 21:32:17 UTC (rev 4308)
@@ -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/trunk/linux-2.6/debian/changelog
===================================================================
--- dists/trunk/linux-2.6/debian/changelog	2005-10-05 14:34:10 UTC (rev 4307)
+++ dists/trunk/linux-2.6/debian/changelog	2005-10-05 21:32:17 UTC (rev 4308)
@@ -100,8 +100,14 @@
   [ dann frazier ]
   * Add a note to README.Debian that explains where users can find the .config
     files used to generate the linux-image packages.  Closes: #316809
+  * [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.  (Note that
+    John Wright is running benchmarks to determine the overhead of running
+    an SMP kernel on UP systems to help decide if this should be a
+    permanent change).
 
- -- dann frazier <dannf at debian.org>  Tue, 27 Sep 2005 22:57:24 -0600
+ -- dann frazier <dannf at debian.org>  Wed,  5 Oct 2005 15:17:05 -0600
 
 linux-2.6 (2.6.12-6) unstable; urgency=high
 

Copied: dists/trunk/linux-2.6/debian/patches-debian/mempolicy-check-mode.patch (from rev 4294, dists/sarge-security/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/mempolicy-check-mode.dpatch)