Commit eb4125df authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'for-linus-4.12b-rc5-tag' of git://

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://
  xen/privcmd: Support correctly 64KB page granularity when mapping memory
parents a92f63cd 753c09b5
......@@ -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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment