diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-06 20:18:43 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-06 20:18:43 +0300 |
| commit | fa29f5ba42404b44aceb1a63ff4757efe5cd1789 (patch) | |
| tree | 8dfe660eeb443561582efe2b0cc7c8b228172796 /arch/x86 | |
| parent | 78e10b5e5a849fdfd910dd7b0170a1c2ca0f3483 (diff) | |
| parent | d724444ab97d2cdf1c4dbfc1ff65d0b18a9631e0 (diff) | |
| download | linux-fa29f5ba42404b44aceb1a63ff4757efe5cd1789.tar.xz | |
Merge tag 'asm-generic-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic updates from Arnd Bergmann:
"Only a few small changes this time:
- Michael S. Tsirkin cleans up linux/mman.h
- Mike Rapoport found a typo
I had originally merged another cleanup series for I/O accessors from
Hugo Lefeuvre as well, but dropped it after the discussion of the
barrier semantics and some conflicts. I expect this series to get
merged for a later release though"
* tag 'asm-generic-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
asm-generic/page.h: fix typo in #error text requiring a real asm/page.h
arch: move common mmap flags to linux/mman.h
drm: tweak header name
x86/mpx: tweak header name
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/mm/mpx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c index de1851d15699..c805db6236b4 100644 --- a/arch/x86/mm/mpx.c +++ b/arch/x86/mm/mpx.c @@ -9,12 +9,12 @@ #include <linux/kernel.h> #include <linux/slab.h> #include <linux/mm_types.h> +#include <linux/mman.h> #include <linux/syscalls.h> #include <linux/sched/sysctl.h> #include <asm/insn.h> #include <asm/insn-eval.h> -#include <asm/mman.h> #include <asm/mmu_context.h> #include <asm/mpx.h> #include <asm/processor.h> |