diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-27 20:41:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-27 20:41:05 -0700 |
| commit | 11224e1fc40a6556dc285573ea93dd522f8c563f (patch) | |
| tree | 908e6a63729bcfae2c3fb1b70ff9705116b20978 /arch/arm | |
| parent | 90e6872061adb913d28e971d9ed783631e3f225a (diff) | |
| parent | 8fc669ea1639f3f6fb2c3a4a4a1e31d975d0e254 (diff) | |
Merge tag 'for-linus-4.14c-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
- a fix for the Xen gntdev device repairing an issue in case of partial
failure of mapping multiple pages of another domain
- a fix of a regression in the Xen balloon driver introduced in 4.13
- a build fix for Xen on ARM which will trigger e.g. for Linux RT
- a maintainers update for pvops (not really Xen, but carrying through
this tree just for convenience)
* tag 'for-linus-4.14c-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
maintainers: drop Chris Wright from pvops
arm/xen: don't inclide rwlock.h directly.
xen: fix booting ballooned down hvm guest
xen/gntdev: avoid out of bounds access in case of partial gntdev_mmap()
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/xen/p2m.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/xen/p2m.c b/arch/arm/xen/p2m.c index e71eefa2e427..0641ba54ab62 100644 --- a/arch/arm/xen/p2m.c +++ b/arch/arm/xen/p2m.c @@ -1,7 +1,7 @@ #include <linux/bootmem.h> #include <linux/gfp.h> #include <linux/export.h> -#include <linux/rwlock.h> +#include <linux/spinlock.h> #include <linux/slab.h> #include <linux/types.h> #include <linux/dma-mapping.h> |