Merge branch 'linus' into sfi-release

Conflicts:
	arch/x86/kernel/setup.c
	drivers/acpi/power.c
	init/main.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 35 insertions, 56 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 4c92c91f354b..1c9a1811c9c5 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -38,7 +38,7 @@ config X86
         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
@@ -150,7 +150,10 @@ config ARCH_HAS_CACHE_LINE_SIZE
 config HAVE_SETUP_PER_CPU_AREA
         def_bool y
 
-config HAVE_DYNAMIC_PER_CPU_AREA
+config NEED_PER_CPU_EMBED_FIRST_CHUNK
+        def_bool y
+
+config NEED_PER_CPU_PAGE_FIRST_CHUNK
         def_bool y
 
 config HAVE_CPUMASK_OF_CPU_MAP
@@ -179,6 +182,10 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING
 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
@@ -318,6 +325,7 @@ config X86_EXTENDED_PLATFORM
                 SGI 320/540 (Visual Workstation)
                 Summit/EXA (IBM x440)
                 Unisys ES7000 IA32 series
+                Moorestown MID devices
 
           If you have one of these systems, or if you want to build a
           generic distribution kernel, say Y here - otherwise say N.
@@ -377,6 +385,18 @@ config X86_ELAN
 
           If unsure, choose "PC-compatible" instead.
 
+config X86_MRST
+       bool "Moorestown MID platform"
+        depends on X86_32
+        depends on X86_EXTENDED_PLATFORM
+        ---help---
+          Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin
+          Internet Device(MID) platform. Moorestown consists of two chips:
+          Lincroft (CPU core, graphics, and memory controller) and Langwell IOH.
+          Unlike standard x86 PCs, Moorestown does not have many legacy devices
+          nor standard legacy replacement devices/features. e.g. Moorestown does
+          not contain i8259, i8254, HPET, legacy BIOS, most of the io ports.
+
 config X86_RDC321X
         bool "RDC R-321x SoC"
         depends on X86_32
@@ -586,7 +606,6 @@ config GART_IOMMU
         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
@@ -777,41 +796,17 @@ config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
           increased on these systems.
 
 config X86_MCE
-        bool "Machine Check Exception"
+        bool "Machine Check / overheating reporting"
         ---help---
-          Machine Check Exception support allows the processor to notify the
-          kernel if it detects a problem (e.g. overheating, component failure).
+          Machine Check support allows the processor to notify the
+          kernel if it detects a problem (e.g. overheating, data corruption).
           The action the kernel takes depends on the severity of the problem,
-          ranging from a warning message on the console, to halting the machine.
-          Your processor must be a Pentium or newer to support this - check the
-          flags in /proc/cpuinfo for mce.  Note that some older Pentium systems
-          have a design flaw which leads to false MCE events - hence MCE is
-          disabled on all P5 processors, unless explicitly enabled with "mce"
-          as a boot argument.  Similarly, if MCE is built in and creates a
-          problem on some new non-standard machine, you can boot with "nomce"
-          to disable it.  MCE support simply ignores non-MCE processors like
-          the 386 and 486, so nearly everyone can say Y here.
-
-config X86_OLD_MCE
-        depends on X86_32 && X86_MCE
-        bool "Use legacy machine check code (will go away)"
-        default n
-        select X86_ANCIENT_MCE
-        ---help---
-          Use the old i386 machine check code. This is merely intended for
-          testing in a transition period. Try this if you run into any machine
-          check related software problems, but report the problem to
-          linux-kernel.  When in doubt say no.
-
-config X86_NEW_MCE
-        depends on X86_MCE
-        bool
-        default y if (!X86_OLD_MCE && X86_32) || X86_64
+          ranging from warning messages to halting the machine.
 
 config X86_MCE_INTEL
         def_bool y
         prompt "Intel MCE features"
-        depends on X86_NEW_MCE && X86_LOCAL_APIC
+        depends on X86_MCE && X86_LOCAL_APIC
         ---help---
            Additional support for intel specific MCE features such as
            the thermal monitor.
@@ -819,14 +814,14 @@ config X86_MCE_INTEL
 config X86_MCE_AMD
         def_bool y
         prompt "AMD MCE features"
-        depends on X86_NEW_MCE && X86_LOCAL_APIC
+        depends on X86_MCE && X86_LOCAL_APIC
         ---help---
            Additional support for AMD specific MCE features such as
            the DRAM Error Threshold.
 
 config X86_ANCIENT_MCE
         def_bool n
-        depends on X86_32
+        depends on X86_32 && X86_MCE
         prompt "Support for old Pentium 5 / WinChip machine checks"
         ---help---
           Include support for machine check handling on old Pentium 5 or WinChip
@@ -839,36 +834,16 @@ config X86_MCE_THRESHOLD
         default y
 
 config X86_MCE_INJECT
-        depends on X86_NEW_MCE
+        depends on X86_MCE
         tristate "Machine check injector support"
         ---help---
           Provide support for injecting machine checks for testing purposes.
           If you don't know what a machine check is and you don't do kernel
           QA it is safe to say n.
 
-config X86_MCE_NONFATAL
-        tristate "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4"
-        depends on X86_OLD_MCE
-        ---help---
-          Enabling this feature starts a timer that triggers every 5 seconds which
-          will look at the machine check registers to see if anything happened.
-          Non-fatal problems automatically get corrected (but still logged).
-          Disable this if you don't want to see these messages.
-          Seeing the messages this option prints out may be indicative of dying
-          or out-of-spec (ie, overclocked) hardware.
-          This option only does something on certain CPUs.
-          (AMD Athlon/Duron and Intel Pentium 4)
-
-config X86_MCE_P4THERMAL
-        bool "check for P4 thermal throttling interrupt."
-        depends on X86_OLD_MCE && X86_MCE && (X86_UP_APIC || SMP)
-        ---help---
-          Enabling this feature will cause a message to be printed when the P4
-          enters thermal throttling.
-
 config X86_THERMAL_VECTOR
         def_bool y
-        depends on X86_MCE_P4THERMAL || X86_MCE_INTEL
+        depends on X86_MCE_INTEL
 
 config VM86
         bool "Enable VM86 support" if EMBEDDED
@@ -1414,6 +1389,10 @@ config X86_PAT
 
           If unsure, say Y.
 
+config ARCH_USES_PG_UNCACHED
+        def_bool y
+        depends on X86_PAT
+
 config EFI
         bool "EFI runtime service support"
         depends on ACPI