r4686 - in dists/trunk/linux-2.6/debian: . arch/amd64

[Frederik Schüler]

Author: fschueler-guest
Date: 2005-10-29 13:11:17 +0000 (Sat, 29 Oct 2005)
New Revision: 4686

Modified:
   dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
   dists/trunk/linux-2.6/debian/changelog
Log:
use DISCONTIGMEM instead of SPARSEMEM on amd64-k8-smp flavour to fix bootup kernel panic.


Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp	2005-10-29 05:33:41 UTC (rev 4685)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp	2005-10-29 13:11:17 UTC (rev 4686)
@@ -33,5 +33,5 @@
 CONFIG_MKISS=m
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_DISCONTIGMEM_MANUAL=y

Modified: dists/trunk/linux-2.6/debian/changelog
===================================================================
--- dists/trunk/linux-2.6/debian/changelog	2005-10-29 05:33:41 UTC (rev 4685)
+++ dists/trunk/linux-2.6/debian/changelog	2005-10-29 13:11:17 UTC (rev 4686)
@@ -12,6 +12,10 @@
   * [alpha] New patch to include compiler.h in barrier.h, barrier() is used in
     non-SMP case.
 
+  [ Frederik Schüler ]
+  * [amd64] use DISCONTIGMEM instead of SPARSEMEM on amd64-k8-smp flavour to
+    fix bootup kernel panic.
+
  -- Norbert Tretkowski <nobse at debian.org>  Fri, 28 Oct 2005 19:26:34 +0200
 
 linux-2.6 (2.6.14-1) unstable; urgency=low