percpu: use a kconfig variable to signal arch specific percpu setup

[firefly-linux-kernel-4.4.55.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index d89b9452815307b34d56cee362487f12fb706cc5..dc80a9f1f303a62f95db804ff6dcecbfdec5e2d3 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -97,6 +97,9 @@ config GENERIC_TIME_VSYSCALL
        bool
        default X86_64
 
+config ARCH_SETS_UP_PER_CPU_AREA
+       def_bool X86_64
+
 config ARCH_SUPPORTS_OPROFILE
        bool
        default y
@@ -129,9 +132,17 @@ config GENERIC_PENDING_IRQ
 
 config X86_SMP
        bool
-       depends on X86_32 && SMP && !X86_VOYAGER
+       depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)
        default y
 
+config X86_32_SMP
+       def_bool y
+       depends on X86_32 && SMP
+
+config X86_64_SMP
+       def_bool y
+       depends on X86_64 && SMP
+
 config X86_HT
        bool
        depends on SMP
@@ -961,21 +972,18 @@ config MTRR
 
 config EFI
        def_bool n
-       prompt "Boot from EFI support"
+       prompt "EFI runtime service support"
        depends on ACPI
        ---help---
-       This enables the kernel to boot on EFI platforms using
-       system configuration information passed to it from the firmware.
-       This also enables the kernel to use any EFI runtime services that are
+       This enables the kernel to use EFI runtime services that are
        available (such as the EFI variable services).
 
-       This option is only useful on systems that have EFI firmware
-       and will result in a kernel image that is ~8k larger.  In addition,
-       you must use the latest ELILO loader available at
-       <http://elilo.sourceforge.net> in order to take advantage of
-       kernel initialization using EFI information (neither GRUB nor LILO know
-       anything about EFI).  However, even with this option, the resultant
-       kernel should continue to boot on existing non-EFI platforms.
+       This option is only useful on systems that have EFI firmware.
+       In addition, you should use the latest ELILO loader available
+       at <http://elilo.sourceforge.net> in order to take advantage
+       of EFI runtime services. However, even with this option, the
+       resultant kernel should continue to boot on existing non-EFI
+       platforms.
 
 config IRQBALANCE
        def_bool y
@@ -1194,6 +1202,11 @@ source "kernel/power/Kconfig"
 
 source "drivers/acpi/Kconfig"
 
+config X86_APM_BOOT
+       bool
+       default y
+       depends on APM || APM_MODULE
+
 menuconfig APM
        tristate "APM (Advanced Power Management) BIOS support"
        depends on X86_32 && PM_SLEEP && !X86_VISWS
@@ -1334,7 +1347,7 @@ menu "Bus options (PCI etc.)"
 config PCI
        bool "PCI support" if !X86_VISWS
        depends on !X86_VOYAGER
-       default y if X86_VISWS
+       default y
        select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)
        help
          Find out whether you have a PCI motherboard. PCI is the name of a