Merge remote-tracking branch 'origin/x86/fpu' into queue/x86/cpu

Use the union of 3.10 x86/cpu and x86/fpu as baseline.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --combined arch/x86/Kconfig.debug
index b6a770132b67315cc7d07b3da152f2027447e2d6,c6acdf75271511c32f33dd1718ed0edd9f870b25..c963881de0d0bdac76923e8fa93e8cc02e6eaab4
--- 1/arch/x86/Kconfig.debug
--- 2/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@@ -122,6 -122,7 +122,6 @@@ config DEBUG_NX_TES
  config DOUBLEFAULT
        default y
        bool "Enable doublefault exception handler" if EXPERT
 -      depends on X86_32
        ---help---
          This option allows trapping of rare doublefault exceptions that
          would otherwise cause a system to silently reboot. Disabling this
@@@ -303,4 -304,14 +303,14 @@@ config DEBUG_NMI_SELFTES
  
          If unsure, say N.
  
+ config X86_DEBUG_STATIC_CPU_HAS
+       bool "Debug alternatives"
+       depends on DEBUG_KERNEL
+       ---help---
+         This option causes additional code to be generated which
+         fails if static_cpu_has() is used before alternatives have
+         run.
+ 
+         If unsure, say N.
+ 
  endmenu

diff --combined arch/x86/include/asm/processor.h
index 5b87d52eed0b4339262f3510ce5cf1bf46992482,578f8b1d691057ab0a36dba9bd86e5c134c3a364..29937c4f6ff8d560900bfbad9a79c919a24aa710
--- 1/arch/x86/include/asm/processor.h
--- 2/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@@ -89,9 -89,9 +89,9 @@@ struct cpuinfo_x86 
        char                    wp_works_ok;    /* It doesn't on 386's */
  
        /* Problems on some 486Dx4's and old 386's: */
-       char                    hard_math;
        char                    rfu;
        char                    pad0;
+       char                    pad1;
  #else
        /* Number of 4K pages in DTLB/ITLB combined(in pages): */
        int                     x86_tlbsize;
@@@ -164,6 -164,7 +164,7 @@@ extern const struct seq_operations cpui
  #define cache_line_size()     (boot_cpu_data.x86_cache_alignment)
  
  extern void cpu_detect(struct cpuinfo_x86 *c);
+ extern void __cpuinit fpu_detect(struct cpuinfo_x86 *c);
  
  extern void early_cpu_init(void);
  extern void identify_boot_cpu(void);
@@@ -981,5 -982,5 +982,5 @@@ bool xen_set_default_idle(void)
  #endif
  
  void stop_this_cpu(void *dummy);
 -
 +void df_debug(struct pt_regs *regs, long error_code);
  #endif /* _ASM_X86_PROCESSOR_H */