Merge branches 'core/softlockup', 'core/softirq', 'core/resources', 'core/printk...

[linux-2.6-omap-h63xx.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index adaca6fa927d976ce0c7f1d21c630c31a1857cec..837a9aae0453f554fa89d60dc42875aa5fff81bc 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -18,6 +18,7 @@ config X86_64
 ### Arch settings
 config X86
        def_bool y
+       select HAVE_AOUT if X86_32
        select HAVE_UNSTABLE_SCHED_CLOCK
        select HAVE_IDE
        select HAVE_OPROFILE
@@ -152,9 +153,6 @@ config AUDIT_ARCH
        bool
        default X86_64
 
-config ARCH_SUPPORTS_AOUT
-       def_bool y
-
 config ARCH_SUPPORTS_OPTIMIZED_INLINING
        def_bool y
 
@@ -949,13 +947,15 @@ config X86_PAE
        def_bool n
        prompt "PAE (Physical Address Extension) Support"
        depends on X86_32 && !HIGHMEM4G
-       select RESOURCES_64BIT
        help
          PAE is required for NX support, and furthermore enables
          larger swapspace support for non-overcommit purposes. It
          has the cost of more pagetable lookup overhead, and also
          consumes more pagetable space per process.
 
+config ARCH_PHYS_ADDR_T_64BIT
+       def_bool X86_64 || X86_PAE
+
 # Common NUMA Features
 config NUMA
        bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
@@ -1438,24 +1438,6 @@ config HOTPLUG_CPU
            automatically on SMP systems. )
          Say N if you want to disable CPU hotplug.
 
-config HOTPLUG_RESTRICT_TO_BOOTUP_CPUS
-       def_bool n
-       prompt "Restrict CPU hotplugging to processors found during boot" if HOTPLUG_CPU
-       ---help---
-         Say no here to use the default, which allows as many CPUs as are marked
-         "disabled" by ACPI or MPTABLES to be hotplugged after bootup.
-
-         Say yes if you do not want to allow CPUs to be added after booting, for
-         example if you only need CPU hotplugging enabled for suspend/resume.
-
-         If CPU_HOTPLUG is enabled this value may be overridden at boot time
-         with the "additional_cpus" kernel parameter.
-
-config HOTPLUG_ADDITIONAL_CPUS
-       int
-       default  0 if !HOTPLUG_CPU || HOTPLUG_RESTRICT_TO_BOOTUP_CPUS
-       default -1
-
 config COMPAT_VDSO
        def_bool y
        prompt "Compat VDSO support"
@@ -1903,7 +1885,7 @@ config IA32_EMULATION
 
 config IA32_AOUT
        tristate "IA32 a.out support"
-       depends on IA32_EMULATION && ARCH_SUPPORTS_AOUT
+       depends on IA32_EMULATION
        help
          Support old a.out binaries in the 32bit emulation.