Merge branch 'x86/core' into tracing/textedit

Conflicts:
	arch/x86/Kconfig
	block/blktrace.c
	kernel/irq/handle.c

Semantic conflict:
	kernel/trace/blktrace.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/Kconfig
index bcc1d2a9d050bd3df0bbe38b05205ec1a349f6a3,31758378bcd2707f7dd2803ecd9a98d2d9a9a063..bdcee12c25ab84e82116e8d408a45debeef1e7a2
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -34,9 -34,8 +34,9 @@@ config X8
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
-       select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
-       select HAVE_ARCH_KGDB if !X86_VOYAGER
 +      select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
+       select HAVE_KVM
+       select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
        select HAVE_GENERIC_DMA_COHERENT if X86_32
        select HAVE_EFFICIENT_UNALIGNED_ACCESS

diff --cc arch/x86/include/asm/cacheflush.h
Simple merge

diff --cc arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
Simple merge

diff --cc arch/x86/kernel/cpu/intel.c
index 5fff00c70de0d1d8ddd3e3ce1ecad2ecec147247,25c559ba8d546fd4e332720165b84b7f5aea6a8e..1a89a2b68d1539a92939e4d33747a1bcd916390c
--- 1/arch/x86/kernel/cpu/intel.c
--- 2/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@@ -65,10 -60,20 +64,22 @@@ static void __cpuinit early_init_intel(
        if (c->x86_power & (1 << 8)) {
                set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
                set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC);
 +              set_cpu_cap(c, X86_FEATURE_TSC_RELIABLE);
 +              sched_clock_stable = 1;
        }
  
+       /*
+        * There is a known erratum on Pentium III and Core Solo
+        * and Core Duo CPUs.
+        * " Page with PAT set to WC while associated MTRR is UC
+        *   may consolidate to UC "
+        * Because of this erratum, it is better to stick with
+        * setting WC in MTRR rather than using PAT on these CPUs.
+        *
+        * Enable PAT WC only on P4, Core 2 or later CPUs.
+        */
+       if (c->x86 == 6 && c->x86_model < 15)
+               clear_cpu_cap(c, X86_FEATURE_PAT);
  }
  
  #ifdef CONFIG_X86_32

diff --cc arch/x86/kernel/dumpstack.c
Simple merge

diff --cc arch/x86/kernel/process.c
index 23b328edc2b3048b4c4c80a50f7fa9865f37a876,6afa5232dbb739f99c07ff0641cc265428db74eb..8c037051b3537c4f5da2d02e5b69e0fc4ec6aa2b
--- 1/arch/x86/kernel/process.c
--- 2/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@@ -8,9 -8,12 +8,12 @@@
  #include <linux/module.h>
  #include <linux/pm.h>
  #include <linux/clockchips.h>
 -#include <linux/ftrace.h>
 +#include <trace/power.h>
  #include <asm/system.h>
  #include <asm/apic.h>
+ #include <asm/idle.h>
+ #include <asm/uaccess.h>
+ #include <asm/i387.h>
  
  unsigned long idle_halt;
  EXPORT_SYMBOL(idle_halt);

diff --cc arch/x86/mm/init_32.c
Simple merge

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc init/main.c
Simple merge

diff --cc kernel/irq/handle.c
index 4709a7c870d77814901571f26370081d0d976036,f51eaee921b603b202bf184cdfdaee3a8da2ca08..412370ab9a34cdc8ed5ec0fac33a75b3bbeb7d0d
--- 1/kernel/irq/handle.c
--- 2/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@@ -17,7 -17,7 +17,8 @@@
  #include <linux/kernel_stat.h>
  #include <linux/rculist.h>
  #include <linux/hash.h>
 +#include <trace/irq.h>
+ #include <linux/bootmem.h>
  
  #include "internals.h"
  

diff --cc kernel/module.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/softirq.c
Simple merge

diff --cc kernel/trace/blktrace.c
Simple merge