diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-30 12:30:09 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-30 12:30:09 +0300 |
| commit | e17bae3266cc3d828003bdf78b5aa019db3ffa95 (patch) | |
| tree | a73f200ba68bea7915b25e1a077c3f43c9183bdc /arch/arm/xen/p2m.c | |
| parent | 773dd2fca581b0a80e5a33332cc8ee67e5a79cba (diff) | |
| parent | 0b07194bb55ed836c2cc7c22e866b87a14681984 (diff) | |
| download | linux-e17bae3266cc3d828003bdf78b5aa019db3ffa95.tar.xz | |
Merge tag 'v4.14-rc7' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/xen/p2m.c')
| -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> |