diff options
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index f843de13e242..7bf10f9b25a3 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -28,7 +28,7 @@ config X86 | |||
28 | select HAVE_KRETPROBES | 28 | select HAVE_KRETPROBES |
29 | select HAVE_FTRACE_MCOUNT_RECORD | 29 | select HAVE_FTRACE_MCOUNT_RECORD |
30 | select HAVE_DYNAMIC_FTRACE | 30 | select HAVE_DYNAMIC_FTRACE |
31 | select HAVE_FTRACE | 31 | select HAVE_FUNCTION_TRACER |
32 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) | 32 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) |
33 | select HAVE_ARCH_KGDB if !X86_VOYAGER | 33 | select HAVE_ARCH_KGDB if !X86_VOYAGER |
34 | select HAVE_ARCH_TRACEHOOK | 34 | select HAVE_ARCH_TRACEHOOK |
@@ -231,6 +231,10 @@ config SMP | |||
231 | 231 | ||
232 | If you don't know what to do here, say N. | 232 | If you don't know what to do here, say N. |
233 | 233 | ||
234 | config X86_HAS_BOOT_CPU_ID | ||
235 | def_bool y | ||
236 | depends on X86_VOYAGER | ||
237 | |||
234 | config X86_FIND_SMP_CONFIG | 238 | config X86_FIND_SMP_CONFIG |
235 | def_bool y | 239 | def_bool y |
236 | depends on X86_MPPARSE || X86_VOYAGER | 240 | depends on X86_MPPARSE || X86_VOYAGER |
@@ -1482,7 +1486,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID | |||
1482 | def_bool X86_64 | 1486 | def_bool X86_64 |
1483 | depends on NUMA | 1487 | depends on NUMA |
1484 | 1488 | ||
1485 | menu "Power management options" | 1489 | menu "Power management and ACPI options" |
1486 | depends on !X86_VOYAGER | 1490 | depends on !X86_VOYAGER |
1487 | 1491 | ||
1488 | config ARCH_HIBERNATION_HEADER | 1492 | config ARCH_HIBERNATION_HEADER |
@@ -1882,6 +1886,10 @@ config SYSVIPC_COMPAT | |||
1882 | endmenu | 1886 | endmenu |
1883 | 1887 | ||
1884 | 1888 | ||
1889 | config HAVE_ATOMIC_IOMAP | ||
1890 | def_bool y | ||
1891 | depends on X86_32 | ||
1892 | |||
1885 | source "net/Kconfig" | 1893 | source "net/Kconfig" |
1886 | 1894 | ||
1887 | source "drivers/Kconfig" | 1895 | source "drivers/Kconfig" |