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

Conflicts:
	drivers/xen/grant-table.c

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

diff --cc drivers/xen/grant-table.c
index 34bdb6d84bedb9ec7b50d6e217608fdd05d30d0b,0a714ad601745f580e0d22b9d8605d9d84bc1491..6905c257a96e54b3cc3e615f2bb65544f671d8dc
--- 1/drivers/xen/grant-table.c
--- 2/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@@ -1088,11 -1140,30 +1089,29 @@@ static void gnttab_request_version(void
                grant_table_version);
  }
  
 -int gnttab_resume(void)
+ static int xlated_setup_gnttab_pages(int numpages, void **addr)
+ {
+       int i, rc;
+       unsigned long pfns[numpages];
+       struct page *pages[numpages];
+ 
+       rc = alloc_xenballooned_pages(numpages, pages, 0);
+       if (rc != 0) {
+               pr_warn("%s Could not balloon alloc %d pfns rc:%d\n", __func__,
+                       numpages, rc);
+               return -ENOMEM;
+       }
+       for (i = 0; i < numpages; i++)
+               pfns[i] = page_to_pfn(pages[i]);
+ 
+       rc = arch_gnttab_map_shared(pfns, numpages, numpages, addr);
+       return rc;
+ }
+ 
 +static int gnttab_setup(void)
  {
-       unsigned int max_nr_gframes;
-       char *kmsg = "Failed to kmalloc pages for pv in hvm grant frames\n";
+       unsigned int rc, max_nr_gframes;
  
 -      gnttab_request_version();
        max_nr_gframes = gnttab_max_grant_frames();
        if (max_nr_gframes < nr_grant_frames)
                return -ENOSYS;