Merge remote-tracking branch 'tmem/linux-next'

Conflicts:
	arch/x86/include/asm/xen/interface.h
	arch/x86/xen/setup.c
	arch/x86/xen/smp.c
	drivers/xen/cpu_hotplug.c

diff --cc arch/x86/include/asm/xen/interface.h
index 20e738a907632a465e69b519a8b9fe3abd5e29dd,104fa507815f0b0afb13f8e11b41fde8a91b6cc5..dc417a1eac83e95c138db006cc8a0504d45d257e
--- 1/arch/x86/include/asm/xen/interface.h
--- 2/arch/x86/include/asm/xen/interface.h
+++ b/arch/x86/include/asm/xen/interface.h
@@@ -145,16 -136,8 +145,17 @@@ struct vcpu_guest_context 
      struct cpu_user_regs user_regs;         /* User-level CPU registers     */
      struct trap_info trap_ctxt[256];        /* Virtual IDT                  */
      unsigned long ldt_base, ldt_ents;       /* LDT (linear address, # ents) */
 -    unsigned long gdt_frames[16], gdt_ents; /* GDT (machine frames, # ents).*
 -                                           * PV in HVM: it's GDTR addr/sz */
 +    union {
 +      struct {
-               /* PV: GDT (machine frames, # ents).*/
++              /* PV: GDT (machine frames, # ents).
++               * PV in HVM: it's GDTR addr/sz */
 +              unsigned long gdt_frames[16], gdt_ents;
 +      } pv;
 +      struct {
 +              /* PVH: GDTR addr and size */
 +              unsigned long gdtaddr, gdtsz;
 +      } pvh;
 +    } u;
      unsigned long kernel_ss, kernel_sp;     /* Virtual TSS (only SS1/SP1)   */
      /* NB. User pagetable on x86/64 is placed in ctrlreg[1]. */
      unsigned long ctrlreg[8];               /* CR0-CR7 (control registers)  */

diff --cc include/xen/interface/xen.h
Simple merge

diff --cc include/xen/xen.h
Simple merge