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

Pull x86 boot updates from Ingo Molnar:
 "The main x86 bootup related changes in this cycle were:

   - more boot time optimizations.  (Len Brown)

   - implement hex output to allow the debugging of early bootup
     parameters.  (Kees Cook)

   - remove obsolete MCA leftovers.  (Paolo Pisati)"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/smpboot: Remove APIC.wait_for_init_deassert and atomic init_deasserted
  x86/smpboot: Remove SIPI delays from cpu_up()
  x86/smpboot: Remove udelay(100) when polling cpu_callin_map
  x86/smpboot: Remove udelay(100) when polling cpu_initialized_map
  x86/boot: Obsolete the MCA sys_desc_table
  x86/boot: Add hex output for debugging

diff --combined arch/x86/include/asm/processor.h
index 9615a4e2645e1ee5e2767390e00ce53a3e10c95e,f60d392c4c9ba157b082d7ff10dd320e7c00ca46..19577dd325fa04443089897863cf59944a78354b
--- 1/arch/x86/include/asm/processor.h
--- 2/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@@ -6,8 -6,8 +6,8 @@@
  /* Forward declaration, a strange C thing */
  struct task_struct;
  struct mm_struct;
 +struct vm86;
  
 -#include <asm/vm86.h>
  #include <asm/math_emu.h>
  #include <asm/segment.h>
  #include <asm/types.h>
@@@ -400,9 -400,15 +400,9 @@@ struct thread_struct 
        unsigned long           cr2;
        unsigned long           trap_nr;
        unsigned long           error_code;
 -#ifdef CONFIG_X86_32
 +#ifdef CONFIG_VM86
        /* Virtual 86 mode info */
 -      struct vm86_struct __user *vm86_info;
 -      unsigned long           screen_bitmap;
 -      unsigned long           v86flags;
 -      unsigned long           v86mask;
 -      unsigned long           saved_sp0;
 -      unsigned int            saved_fs;
 -      unsigned int            saved_gs;
 +      struct vm86             *vm86;
  #endif
        /* IO permissions: */
        unsigned long           *io_bitmap_ptr;
@@@ -645,14 -651,6 +645,6 @@@ static inline void update_debugctlmsr(u
  
  extern void set_task_blockstep(struct task_struct *task, bool on);
  
- /*
-  * from system description table in BIOS. Mostly for MCA use, but
-  * others may find it useful:
-  */
- extern unsigned int           machine_id;
- extern unsigned int           machine_submodel_id;
- extern unsigned int           BIOS_revision;
- 
  /* Boot loader type from the setup header: */
  extern int                    bootloader_type;
  extern int                    bootloader_version;
@@@ -714,6 -712,7 +706,6 @@@ static inline void spin_lock_prefetch(c
  
  #define INIT_THREAD  {                                                          \
        .sp0                    = TOP_OF_INIT_STACK,                      \
 -      .vm86_info              = NULL,                                   \
        .sysenter_cs            = __KERNEL_CS,                            \
        .io_bitmap_ptr          = NULL,                                   \
  }