summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-06-09 09:59:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-06-09 09:59:51 -0700
commiteb4125dfdb1f64a5e41da8315bff48f67e5d1712 (patch)
tree1171db08210b42cb7df472293be36c9b855d44af
parenta92f63cd13776e35d3ccb63187d1d95ab16f24a5 (diff)
parent753c09b5652bb4fe53e2db648002ec64b32b8827 (diff)
downloadlinux-eb4125dfdb1f64a5e41da8315bff48f67e5d1712.tar.bz2
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
-rw-r--r--drivers/xen/privcmd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index 7a92a5e1d40c..feca75b07fdd 100644
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -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;
}