Merge branch 'stable/pvh.v7' into stable/for-linus-3.9

* stable/pvh.v7:
  xen/pvh: specify xen features strings cleanly for PVH
  xen: implement updated XENMEM_add_to_physmap_range ABI
  x86/xen: Use __pa_symbol instead of __pa on C visible symbols
  xen/privcmd: fix condition in privcmd_close()
  xen/x86: remove duplicated include from enlighten.c
  xen: x86 pvh: use XENMEM_add_to_physmap_range for foreign gmfn mappings
  xen/pvh: balloon and grant changes.
  xen/pvh: bootup and setup (E820) related changes.
  xen/pvh: Implement MMU changes for PVH.
  xen/pvh: Extend vcpu_guest_context, p2m, event, and XenBus.
  xen/smp: Move the common CPU init code a bit to prep for PVH patch.
  xen/pvh: Support ParaVirtualized Hardware extensions.

diff --cc arch/arm/xen/enlighten.c
Simple merge

diff --cc arch/x86/xen/Kconfig
Simple merge

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc arch/x86/xen/mmu.c
Simple merge

diff --cc arch/x86/xen/smp.c
Simple merge

diff --cc drivers/xen/cpu_hotplug.c
Simple merge

diff --cc drivers/xen/events.c
Simple merge

diff --cc drivers/xen/gntdev.c
Simple merge

diff --cc drivers/xen/grant-table.c
index 157c0ccda3efdce0e8a3c4b9ab0937ade1d932ec,70125667557daa7654757e0a6ea5dd52ad88c6ff..b6655a1f200c5b28a793771becf81d59e59b3c3e
--- 1/drivers/xen/grant-table.c
--- 2/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@@ -1135,10 -1139,12 +1141,11 @@@ static void gnttab_request_version(void
                grant_table_version);
  }
  
 -int gnttab_resume(void)
 +static int gnttab_setup(void)
  {
        unsigned int max_nr_gframes;
+       char *kmsg = "Failed to kmalloc pages for pv in hvm grant frames\n";
  
 -      gnttab_request_version();
        max_nr_gframes = gnttab_max_grant_frames();
        if (max_nr_gframes < nr_grant_frames)
                return -ENOSYS;

diff --cc drivers/xen/privcmd.c
Simple merge