Merge branch 'x86/asm' into tracing/syscalls

We need the wider TIF work-mask checks in entry_32.S.

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

diff --combined arch/x86/Kconfig
index b0a638b4199a668b2be573caebbdbfffa12f4c12,7fcf85182681c5d04be5d3e681cf47bdf11cabab..1a3150570785f2285e37c3c5c811d742c753697c
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -34,8 -34,6 +34,8 @@@ config X8
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
 +      select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
 +      select HAVE_FTRACE_SYSCALLS
        select HAVE_KVM
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
@@@ -933,6 -931,12 +933,12 @@@ config X86_CPUI
          with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
          /dev/cpu/31/cpuid.
  
+ config X86_CPU_DEBUG
+       tristate "/sys/kernel/debug/x86/cpu/* - CPU Debug support"
+       ---help---
+         If you select this option, this will provide various x86 CPUs
+         information through debugfs.
+ 
  choice
        prompt "High Memory Support"
        default HIGHMEM4G if !X86_NUMAQ
@@@ -1433,7 -1437,7 +1439,7 @@@ config CRASH_DUM
  config KEXEC_JUMP
        bool "kexec jump (EXPERIMENTAL)"
        depends on EXPERIMENTAL
-       depends on KEXEC && HIBERNATION && X86_32
+       depends on KEXEC && HIBERNATION
        ---help---
          Jump between original kernel and kexeced kernel and invoke
          code in physical address mode via KEXEC