Merge branch 'stable/mmu.fixes' into linux-next

* stable/mmu.fixes:
  xen: modify kernel mappings corresponding to granted pages
  xen: add an "highmem" parameter to alloc_xenballooned_pages

Conflicts:
	drivers/xen/balloon.c

diff --cc arch/x86/include/asm/xen/page.h
Simple merge

diff --cc drivers/block/xen-blkback/blkback.c
Simple merge

diff --cc drivers/xen/balloon.c
index 6c93c5766fb622a3b82450ca4533b7d986787f08,cd8b4704ef4e79eff333816a5637194a427b453a..cba8bebb7fe891e96683b9a41de304937fa29289
--- 1/drivers/xen/balloon.c
--- 2/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@@ -500,16 -501,17 +500,17 @@@ EXPORT_SYMBOL_GPL(balloon_set_new_targe
   * alloc_xenballooned_pages - get pages that have been ballooned out
   * @nr_pages: Number of pages to get
   * @pages: pages returned
+  * @highmem: highmem or lowmem pages
   * @return 0 on success, error otherwise
   */
- int alloc_xenballooned_pages(int nr_pages, struct page **pages)
+ int alloc_xenballooned_pages(int nr_pages, struct page **pages, bool highmem)
  {
        int pgno = 0;
 -      struct page* page;
 +      struct page *page;
        mutex_lock(&balloon_mutex);
        while (pgno < nr_pages) {
-               page = balloon_retrieve(true);
-               if (page) {
+               page = balloon_retrieve(highmem);
+               if (page && PageHighMem(page) == highmem) {
                        pages[pgno++] = page;
                } else {
                        enum bp_state st;

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

diff --cc drivers/xen/grant-table.c
Simple merge