[PATCH] x86_64: Limit max number of CPUs to 255

[linux-2.6] / arch / x86_64 / Kconfig

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 2efc4be227095f6c59c3502d72617bf39705eb37..6fc631457196b871f815a2929b35200f402498b1 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -305,7 +305,11 @@ config ARCH_DISCONTIGMEM_DEFAULT
 
 config ARCH_SPARSEMEM_ENABLE
        def_bool y
 
 config ARCH_SPARSEMEM_ENABLE
        def_bool y

-       depends on NUMA
+       depends on (NUMA || EXPERIMENTAL)
+
+config ARCH_MEMORY_PROBE
+       def_bool y
+       depends on MEMORY_HOTPLUG

 
 config ARCH_FLATMEM_ENABLE
        def_bool y
 
 config ARCH_FLATMEM_ENABLE
        def_bool y


@@ -315,10 +319,11 @@ source "mm/Kconfig"
 
 config HAVE_ARCH_EARLY_PFN_TO_NID
        def_bool y
 
 config HAVE_ARCH_EARLY_PFN_TO_NID
        def_bool y

+       depends on NUMA

 
 config NR_CPUS
        int "Maximum number of CPUs (2-256)"
 
 config NR_CPUS
        int "Maximum number of CPUs (2-256)"

-       range 2 256
+       range 2 255

        depends on SMP
        default "8"
        help
        depends on SMP
        default "8"
        help


@@ -349,21 +354,6 @@ config HPET_TIMER
          as it is off-chip.  You can find the HPET spec at
          <http://www.intel.com/hardwaredesign/hpetspec.htm>.
 
          as it is off-chip.  You can find the HPET spec at
          <http://www.intel.com/hardwaredesign/hpetspec.htm>.
 

-config X86_PM_TIMER
-       bool "PM timer"
-       depends on ACPI
-       default y
-       help
-         Support the ACPI PM timer for time keeping. This is slow,
-         but is useful on some chipsets without HPET on systems with more
-         than one CPU. On a single processor or single socket multi core
-         system it is normally not required.
-         When the PM timer is active 64bit vsyscalls are disabled
-         and should not be enabled (/proc/sys/kernel/vsyscall64 should
-         not be changed).
-         The kernel selects the PM timer only as a last resort, so it is
-         useful to enable just in case.
-

 config HPET_EMULATE_RTC
        bool "Provide RTC interrupt"
        depends on HPET_TIMER && RTC=y
 config HPET_EMULATE_RTC
        bool "Provide RTC interrupt"
        depends on HPET_TIMER && RTC=y


@@ -439,10 +429,10 @@ config CRASH_DUMP
 config PHYSICAL_START
        hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
        default "0x1000000" if CRASH_DUMP
 config PHYSICAL_START
        hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
        default "0x1000000" if CRASH_DUMP

-       default "0x100000"
+       default "0x200000"

        help
          This gives the physical address where the kernel is loaded. Normally
        help
          This gives the physical address where the kernel is loaded. Normally

-         for regular kernels this value is 0x100000 (1MB). But in the case
+         for regular kernels this value is 0x200000 (2MB). But in the case

          of kexec on panic the fail safe kernel needs to run at a different
          address than the panic-ed kernel. This option is used to set the load
          address for kernels used to capture crash dump on being kexec'ed
          of kexec on panic the fail safe kernel needs to run at a different
          address than the panic-ed kernel. This option is used to set the load
          address for kernels used to capture crash dump on being kexec'ed


@@ -474,6 +464,14 @@ config SECCOMP
 
 source kernel/Kconfig.hz
 
 
 source kernel/Kconfig.hz
 

+config REORDER
+       bool "Function reordering"
+       default n
+       help
+         This option enables the toolchain to reorder functions for a more 
+         optimal TLB usage. If you have pretty much any version of binutils, 
+        this can increase your kernel build time by roughly one minute.
+

 endmenu
 
 #
 endmenu
 
 #


@@ -587,6 +585,7 @@ source "arch/x86_64/oprofile/Kconfig"
 
 config KPROBES
        bool "Kprobes (EXPERIMENTAL)"
 
 config KPROBES
        bool "Kprobes (EXPERIMENTAL)"

+       depends on EXPERIMENTAL && MODULES

        help
          Kprobes allows you to trap at almost any kernel address and
          execute a callback function.  register_kprobe() establishes
        help
          Kprobes allows you to trap at almost any kernel address and
          execute a callback function.  register_kprobe() establishes