diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-06 18:18:43 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-06 18:18:43 +0100 |
| commit | fa29f5ba42404b44aceb1a63ff4757efe5cd1789 (patch) | |
| tree | 8dfe660eeb443561582efe2b0cc7c8b228172796 /arch/xtensa | |
| parent | Merge tag 'y2038-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/p... (diff) | |
| parent | asm-generic/page.h: fix typo in #error text requiring a real asm/page.h (diff) | |
| download | linux-fa29f5ba42404b44aceb1a63ff4757efe5cd1789.tar.xz linux-fa29f5ba42404b44aceb1a63ff4757efe5cd1789.zip | |
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/xtensa')
| -rw-r--r-- | arch/xtensa/include/uapi/asm/mman.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/xtensa/include/uapi/asm/mman.h b/arch/xtensa/include/uapi/asm/mman.h index 58f29a9d895d..be726062412b 100644 --- a/arch/xtensa/include/uapi/asm/mman.h +++ b/arch/xtensa/include/uapi/asm/mman.h @@ -34,9 +34,7 @@ /* * Flags for mmap */ -#define MAP_SHARED 0x001 /* Share changes */ -#define MAP_PRIVATE 0x002 /* Changes are private */ -#define MAP_SHARED_VALIDATE 0x003 /* share + validate extension flags */ +/* 0x01 - 0x03 are defined in linux/mman.h */ #define MAP_TYPE 0x00f /* Mask for type of mapping */ #define MAP_FIXED 0x010 /* Interpret addr exactly */ |