diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 21:15:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 21:15:51 -0400 |
| commit | cd166bd0dde265a97dd9aa8e3451a2646d96d04b (patch) | |
| tree | 3a7fb5b8bb8d7676e804845b75977be380b8dcff /arch/arm/include/asm/mman.h | |
| parent | 6b702462cbe5b6f372966a53f4465d745d86b65c (diff) | |
| parent | 5b02ee3d219f9e01b6e9146e25613822cfc2e5ce (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
add generic lib/checksum.c
asm-generic: add a generic uaccess.h
asm-generic: add generic NOMMU versions of some headers
asm-generic: add generic atomic.h and io.h
asm-generic: add legacy I/O header files
asm-generic: add generic versions of common headers
asm-generic: make bitops.h usable
asm-generic: make pci.h usable directly
asm-generic: make get_rtc_time overridable
asm-generic: rename page.h and uaccess.h
asm-generic: rename atomic.h to atomic-long.h
asm-generic: add a generic unistd.h
asm-generic: add generic ABI headers
asm-generic: add generic sysv ipc headers
asm-generic: introduce asm/bitsperlong.h
asm-generic: rename termios.h, signal.h and mman.h
Diffstat (limited to 'arch/arm/include/asm/mman.h')
| -rw-r--r-- | arch/arm/include/asm/mman.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/mman.h b/arch/arm/include/asm/mman.h index 54570d2e95b7..fc26976d8e3a 100644 --- a/arch/arm/include/asm/mman.h +++ b/arch/arm/include/asm/mman.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef __ARM_MMAN_H__ | 1 | #ifndef __ARM_MMAN_H__ |
| 2 | #define __ARM_MMAN_H__ | 2 | #define __ARM_MMAN_H__ |
| 3 | 3 | ||
| 4 | #include <asm-generic/mman.h> | 4 | #include <asm-generic/mman-common.h> |
| 5 | 5 | ||
| 6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | 6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ |
| 7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | 7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ |