From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Sat, 26 Jan 2013 00:26:09 +0000 (-0500)
Subject: Merge branch 'stable/pvh.v7' into stable/for-linus-3.9
X-Git-Tag: next-20130218~34^2~3^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d19e3c291caf95cebde9a368f177747c0a38ab87;p=karo-tx-linux.git

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

d19e3c291caf95cebde9a368f177747c0a38ab87
diff --cc drivers/xen/grant-table.c
index 157c0ccda3ef,70125667557d..b6655a1f200c
--- a/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;