diff options
| author | Chris Zankel | 2014-11-10 09:24:48 +0100 |
|---|---|---|
| committer | Chris Zankel | 2014-11-10 09:24:48 +0100 |
| commit | c0d7aa07504a8f4abd7b02b9144c4a92b7565f45 (patch) | |
| tree | a983f40010592c96e43def4f1293392bb3c99f2d /arch/xtensa/include/uapi/asm | |
| parent | Merge tag 'v3.18-rc4' into for_next (diff) | |
| parent | xtensa: remove s6000 variant and s6105 platform (diff) | |
| download | kernel-qcow2-linux-c0d7aa07504a8f4abd7b02b9144c4a92b7565f45.tar.gz kernel-qcow2-linux-c0d7aa07504a8f4abd7b02b9144c4a92b7565f45.tar.xz kernel-qcow2-linux-c0d7aa07504a8f4abd7b02b9144c4a92b7565f45.zip | |
Merge tag 'xtensa-for-next-20141021-2' of git://github.com/jcmvbkbc/linux-xtensa into for_next
Xtensa improvements for 3.18:
- fix nommu support;
- remove s6000 variant and s6105 platform.
Diffstat (limited to 'arch/xtensa/include/uapi/asm')
| -rw-r--r-- | arch/xtensa/include/uapi/asm/mman.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/xtensa/include/uapi/asm/mman.h b/arch/xtensa/include/uapi/asm/mman.h index 00eed6786d7e..201aec0e0446 100644 --- a/arch/xtensa/include/uapi/asm/mman.h +++ b/arch/xtensa/include/uapi/asm/mman.h @@ -55,6 +55,12 @@ #define MAP_NONBLOCK 0x20000 /* do not block on IO */ #define MAP_STACK 0x40000 /* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x80000 /* create a huge page mapping */ +#ifdef CONFIG_MMAP_ALLOW_UNINITIALIZED +# define MAP_UNINITIALIZED 0x4000000 /* For anonymous mmap, memory could be + * uninitialized */ +#else +# define MAP_UNINITIALIZED 0x0 /* Don't support this flag */ +#endif /* * Flags for msync |