From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 13 Feb 2013 15:24:10 +0000 (-0500)
Subject: Merge branch 'stable/pvh.v7' into linux-next
X-Git-Tag: next-20130218~34^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a71c9cded45e72de522e83664f341897340ec4c0;p=karo-tx-linux.git

Merge branch 'stable/pvh.v7' into linux-next

* stable/pvh.v7:
  xen/pvh: Use ballooning to allocate grant table pages [v2]
  Revert "xen/pvh linux: Use ballooning to allocate grant table pages"
---

a71c9cded45e72de522e83664f341897340ec4c0
diff --cc drivers/xen/grant-table.c
index 6905c257a96e,45a33b4af006..2040e874d8f7
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@@ -1108,10 -1182,12 +1131,11 @@@ static int xlated_setup_gnttab_pages(un
  	return rc;
  }
  
 -int gnttab_resume(void)
 +static int gnttab_setup(void)
  {
- 	unsigned int rc, max_nr_gframes;
+ 	int rc;
+ 	unsigned int max_nr_gframes;
  
 -	gnttab_request_version();
  	max_nr_gframes = gnttab_max_grant_frames();
  	if (max_nr_gframes < nr_grant_frames)
  		return -ENOSYS;