SOURCES (LINUX_2_6_20): kernel-x86_64-smp.config - reenable numa a...

[pluto]

Author: pluto                        Date: Fri Feb 23 10:20:42 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6_20
---- Log message:
- reenable numa and memory hotplug, disable stack protector.

---- Files affected:
SOURCES:
   kernel-x86_64-smp.config (1.1.2.134.2.4 -> 1.1.2.134.2.5) 

---- Diffs:

================================================================
Index: SOURCES/kernel-x86_64-smp.config
diff -u SOURCES/kernel-x86_64-smp.config:1.1.2.134.2.4 SOURCES/kernel-x86_64-smp.config:1.1.2.134.2.5
--- SOURCES/kernel-x86_64-smp.config:1.1.2.134.2.4	Fri Feb 23 10:58:50 2007
+++ SOURCES/kernel-x86_64-smp.config	Fri Feb 23 11:20:37 2007
@@ -137,18 +137,30 @@
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
 CONFIG_PREEMPT_BKL=y
-# CONFIG_NUMA is not set
+CONFIG_NUMA=y
+# CONFIG_K8_NUMA is not set
+CONFIG_NODES_SHIFT=6
+CONFIG_X86_64_ACPI_NUMA=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
+CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_MEMORY_PROBE=y
 CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_FLATMEM_MANUAL is not set
+CONFIG_DISCONTIGMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
+CONFIG_DISCONTIGMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_MEMORY_HOTPLUG=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MIGRATION=y
 CONFIG_RESOURCES_64BIT=y
+CONFIG_MEMORY_HOTPLUG_RESERVE=y
+CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
+CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y
 CONFIG_NR_CPUS=8
 CONFIG_HOTPLUG_CPU=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -165,8 +177,7 @@
 # CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x200000
 CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
-CONFIG_CC_STACKPROTECTOR_ALL=y
+# CONFIG_CC_STACKPROTECTOR is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
 CONFIG_HZ_300=y
@@ -206,6 +217,7 @@
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_IBM=m
 CONFIG_ACPI_TOSHIBA=m
@@ -217,6 +229,7 @@
 CONFIG_ACPI_SYSTEM=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_HOTPLUG_MEMORY=m
 CONFIG_ACPI_SBS=m
 
 #
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-x86_64-smp.config?r1=1.1.2.134.2.4&r2=1.1.2.134.2.5&f=u