Commit eb4125df authored Jun 09, 2017 by Linus Torvalds

Merge tag 'for-linus-4.12b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen fix from Juergen Gross:
 "A fix for Xen on ARM when dealing with 64kB page size of a guest"

* tag 'for-linus-4.12b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/privcmd: Support correctly 64KB page granularity when mapping memory

parents a92f63cd 753c09b5

drivers/xen/privcmd.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -362,8 +362,8 @@ static int mmap_batch_fn(void data, int nr, void state)
		st->global_error = 1;
		}
		}
		st->va += PAGE_SIZE * nr;
		st->index += nr;
		st->va += XEN_PAGE_SIZE * nr;
		st->index += nr / XEN_PFN_PER_PAGE;

		return 0;
		}