Merge commit 'v2.6.28-rc4' into x86/apic

1 files changed, 10 insertions, 2 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 350bee1d54dc..4cf0ab13d187 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -28,7 +28,7 @@ config X86
         select HAVE_KRETPROBES
         select HAVE_FTRACE_MCOUNT_RECORD
         select HAVE_DYNAMIC_FTRACE
-        select HAVE_FTRACE
+        select HAVE_FUNCTION_TRACER
         select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
         select HAVE_ARCH_KGDB if !X86_VOYAGER
         select HAVE_ARCH_TRACEHOOK
@@ -231,6 +231,10 @@ config SMP
 
           If you don't know what to do here, say N.
 
+config X86_HAS_BOOT_CPU_ID
+        def_bool y
+        depends on X86_VOYAGER
+
 config X86_FIND_SMP_CONFIG
         def_bool y
         depends on X86_MPPARSE || X86_VOYAGER
@@ -1490,7 +1494,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
         def_bool X86_64
         depends on NUMA
 
-menu "Power management options"
+menu "Power management and ACPI options"
         depends on !X86_VOYAGER
 
 config ARCH_HIBERNATION_HEADER
@@ -1890,6 +1894,10 @@ config SYSVIPC_COMPAT
 endmenu
 
 
+config HAVE_ATOMIC_IOMAP
+        def_bool y
+        depends on X86_32
+
 source "net/Kconfig"
 
 source "drivers/Kconfig"