Merge branch 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, intel_txt: clean up the impact on generic code, unbreak non-x86
  x86, intel_txt: Handle ACPI_SLEEP without X86_TRAMPOLINE
  x86, intel_txt: Fix typos in Kconfig help
  x86, intel_txt: Factor out the code for S3 setup
  x86, intel_txt: tboot.c needs <asm/fixmap.h>
  intel_txt: Force IOMMU on for Intel TXT launch
  x86, intel_txt: Intel TXT Sx shutdown support
  x86, intel_txt: Intel TXT reboot/halt shutdown support
  x86, intel_txt: Intel TXT boot support

diff --combined arch/x86/Kconfig
index fc20fdc,1401d4f..74bf3e3
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -38,7 -38,7 +38,7 @@@ config X8
        select HAVE_FUNCTION_GRAPH_FP_TEST
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
        select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
 -      select HAVE_FTRACE_SYSCALLS
 +      select HAVE_SYSCALL_TRACEPOINTS
        select HAVE_KVM
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
@@@ -179,6 -179,10 +179,10 @@@ config ARCH_SUPPORTS_OPTIMIZED_INLININ
  config ARCH_SUPPORTS_DEBUG_PAGEALLOC
        def_bool y
  
+ config HAVE_INTEL_TXT
+       def_bool y
+       depends on EXPERIMENTAL && DMAR && ACPI
+ 
  # Use the generic interrupt handling code in kernel/irq/:
  config GENERIC_HARDIRQS
        bool
@@@ -586,6 -590,7 +590,6 @@@ config GART_IOMM
        bool "GART IOMMU support" if EMBEDDED
        default y
        select SWIOTLB
 -      select AGP
        depends on X86_64 && PCI
        ---help---
          Support for full DMA access of devices with 32bit memory access only

diff --combined arch/x86/kernel/smpboot.c
index c36cc14,7d9d8ee..9d83191
--- 1/arch/x86/kernel/smpboot.c
--- 2/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@@ -47,6 -47,7 +47,7 @@@
  #include <linux/bootmem.h>
  #include <linux/err.h>
  #include <linux/nmi.h>
+ #include <linux/tboot.h>
  
  #include <asm/acpi.h>
  #include <asm/desc.h>
@@@ -434,8 -435,7 +435,8 @@@ const struct cpumask *cpu_coregroup_mas
         * For perf, we return last level cache shared map.
         * And for power savings, we return cpu_core_map
         */
 -      if (sched_mc_power_savings || sched_smt_power_savings)
 +      if ((sched_mc_power_savings || sched_smt_power_savings) &&
 +          !(cpu_has(c, X86_FEATURE_AMD_DCM)))
                return cpu_core_mask(cpu);
        else
                return c->llc_shared_map;
@@@ -1318,6 -1318,7 +1319,7 @@@ void play_dead_common(void
  void native_play_dead(void)
  {
        play_dead_common();
+       tboot_shutdown(TB_SHUTDOWN_WFS);
        wbinvd_halt();
  }