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"

diff --cc drivers/xen/grant-table.c
index 6905c257a96e54b3cc3e615f2bb65544f671d8dc,45a33b4af006bb466cac6ea851afa1337f6ac30e..2040e874d8f78fd257d1e963d17d8b2c13d8ad63
--- 1/drivers/xen/grant-table.c
--- 2/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;