Merge commit 'v2.6.28-rc8' into x86/mm

diff --combined arch/x86/Kconfig
index 25e71152611639a6f5dc5a2aef9a76ae834a4040,ac22bb7719f730e6b8d12b305ec9e08952a513a4..cb6a58b77126c5dab5f5043176766ee9a1107182
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -28,7 -28,7 +28,7 @@@ config X8
        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
@@@ -116,6 -116,9 +116,9 @@@ config GENERIC_TIME_VSYSCAL
  config ARCH_HAS_CPU_RELAX
        def_bool y
  
+ config ARCH_HAS_DEFAULT_IDLE
+       def_bool y
+ 
  config ARCH_HAS_CACHE_LINE_SIZE
        def_bool y
  
@@@ -164,9 -167,12 +167,12 @@@ config GENERIC_PENDING_IR
  config X86_SMP
        bool
        depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)
-       select USE_GENERIC_SMP_HELPERS
        default y
  
+ config USE_GENERIC_SMP_HELPERS
+       def_bool y
+       depends on SMP
+ 
  config X86_32_SMP
        def_bool y
        depends on X86_32 && SMP
@@@ -228,6 -234,10 +234,10 @@@ config SM
  
          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
@@@ -946,15 -956,6 +956,15 @@@ config X86_PA
  config ARCH_PHYS_ADDR_T_64BIT
         def_bool X86_64 || X86_PAE
  
 +config DIRECT_GBPAGES
 +      bool "Enable 1GB pages for kernel pagetables" if EMBEDDED
 +      default y
 +      depends on X86_64
 +      help
 +        Allow the kernel linear mapping to use 1GB pages on CPUs that
 +        support it. This can improve the kernel's performance a tiny bit by
 +        reducing TLB pressure. If in doubt, say "Y".
 +
  # Common NUMA Features
  config NUMA
        bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
@@@ -1492,15 -1493,11 +1502,15 @@@ config ARCH_ENABLE_MEMORY_HOTPLU
        def_bool y
        depends on X86_64 || (X86_32 && HIGHMEM)
  
 +config ARCH_ENABLE_MEMORY_HOTREMOVE
 +      def_bool y
 +      depends on MEMORY_HOTPLUG
 +
  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
@@@ -1648,6 -1645,8 +1658,8 @@@ source "arch/x86/kernel/cpu/cpufreq/Kco
  
  source "drivers/cpuidle/Kconfig"
  
+ source "drivers/idle/Kconfig"
+ 
  endmenu
  
  
@@@ -1898,6 -1897,10 +1910,10 @@@ config SYSVIPC_COMPA
  endmenu
  
  
+ config HAVE_ATOMIC_IOMAP
+       def_bool y
+       depends on X86_32
+ 
  source "net/Kconfig"
  
  source "drivers/Kconfig"