From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 1 Nov 2012 03:40:54 +0000 (+1100)
Subject: Merge remote-tracking branch 'tmem/linux-next'
X-Git-Tag: next-20121101~21
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ec363ccb2c430e830eab25e9831d1a28ade1f061;p=karo-tx-linux.git

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
---

ec363ccb2c430e830eab25e9831d1a28ade1f061
diff --cc arch/x86/include/asm/xen/interface.h
index 20e738a90763,104fa507815f..dc417a1eac83
--- a/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)  */