Merge branch 'stable/for-linus-3.8' into linux-next

* stable/for-linus-3.8:
  Revert "xen PVonHVM: use E820_Reserved area for shared_info"
  Revert "xen/PVonHVM: fix compile warning in init_hvm_pv_info"

Conflicts:
	arch/x86/xen/enlighten.c

diff --cc arch/x86/xen/enlighten.c
index 00314286f11e0a2b91801d7185201eedc3622e26,e0140923062fd34f321b8bc32eaa7d9ea053bfcb..3556678afd1782e26bff48021a4410fae7a8e56c
--- 1/arch/x86/xen/enlighten.c
--- 2/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@@ -1553,18 -1517,15 +1553,17 @@@ asmlinkage void __init xen_start_kernel
  #endif
  }
  
- #ifdef CONFIG_XEN_PVHVM
- #define HVM_SHARED_INFO_ADDR 0xFE700000UL
- static struct shared_info *xen_hvm_shared_info;
- static unsigned long xen_hvm_sip_phys;
- static int xen_major, xen_minor;
- 
+ void __ref xen_hvm_init_shared_info(void)
 +/* Use a pfn in RAM, may move to MMIO before kexec.
 + * This function also called for PVH dom0 */
- static void xen_hvm_connect_shared_info(unsigned long pfn)
  {
+       int cpu;
        struct xen_add_to_physmap xatp;
+       static struct shared_info *shared_info_page = 0;
  
+       if (!shared_info_page)
+               shared_info_page = (struct shared_info *)
+                       extend_brk(PAGE_SIZE, PAGE_SIZE);
        xatp.domid = DOMID_SELF;
        xatp.idx = 0;
        xatp.space = XENMAPSPACE_shared_info;