diff options
| author | Ben Cheng <bccheng@google.com> | 2012-03-07 16:14:53 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-07 16:14:53 -0800 |
| commit | 4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd (patch) | |
| tree | 81138dd64a4b9ea18c3cfd5c69783add6deeb201 /libc/kernel/arch-arm/asm/mman.h | |
| parent | 94a85f663694e1869acb1c2e8a3c374a6fa3ab86 (diff) | |
| download | bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.zip bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.tar.gz bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.tar.bz2 | |
Revert "Update bionic kernel headers using update_all.py"
This reverts commit 94a85f663694e1869acb1c2e8a3c374a6fa3ab86
There is a smoke test failure for Prime but Crespo/Stingray are fine. Will revert the change for now until further investigation is made.
Diffstat (limited to 'libc/kernel/arch-arm/asm/mman.h')
| -rw-r--r-- | libc/kernel/arch-arm/asm/mman.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libc/kernel/arch-arm/asm/mman.h b/libc/kernel/arch-arm/asm/mman.h index c391fe4..8f71d1b 100644 --- a/libc/kernel/arch-arm/asm/mman.h +++ b/libc/kernel/arch-arm/asm/mman.h @@ -7,28 +7,22 @@ *** structures, and macros generated from the original header, and thus, *** contains no copyrightable information. *** - *** To edit the content of this header, modify the corresponding - *** source file (e.g. under external/kernel-headers/original/) then - *** run bionic/libc/kernel/tools/update_all.py - *** - *** Any manual change here will be lost the next time this script will - *** be run. You've been warned! - *** **************************************************************************** ****************************************************************************/ #ifndef __ARM_MMAN_H__ #define __ARM_MMAN_H__ + #include <asm-generic/mman.h> + #define MAP_GROWSDOWN 0x0100 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define MAP_DENYWRITE 0x0800 #define MAP_EXECUTABLE 0x1000 #define MAP_LOCKED 0x2000 #define MAP_NORESERVE 0x4000 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define MAP_POPULATE 0x8000 #define MAP_NONBLOCK 0x10000 + #define MCL_CURRENT 1 #define MCL_FUTURE 2 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + #endif |