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/common/linux/ipc.h | |
| parent | 94a85f663694e1869acb1c2e8a3c374a6fa3ab86 (diff) | |
| download | android_bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.tar.gz android_bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.tar.bz2 android_bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.zip | |
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/common/linux/ipc.h')
| -rw-r--r-- | libc/kernel/common/linux/ipc.h | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/libc/kernel/common/linux/ipc.h b/libc/kernel/common/linux/ipc.h index 290189c8f..54766d56d 100644 --- a/libc/kernel/common/linux/ipc.h +++ b/libc/kernel/common/linux/ipc.h @@ -7,45 +7,42 @@ *** 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 _LINUX_IPC_H #define _LINUX_IPC_H + #include <linux/types.h> + #define IPC_PRIVATE ((__kernel_key_t) 0) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + struct ipc_perm { __kernel_key_t key; __kernel_uid_t uid; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __kernel_gid_t gid; __kernel_uid_t cuid; __kernel_gid_t cgid; __kernel_mode_t mode; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ unsigned short seq; }; + #include <asm/ipcbuf.h> + #define IPC_CREAT 00001000 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define IPC_EXCL 00002000 #define IPC_NOWAIT 00004000 + #define IPC_DIPC 00010000 #define IPC_OWN 00020000 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + #define IPC_RMID 0 #define IPC_SET 1 #define IPC_STAT 2 #define IPC_INFO 3 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + #define IPC_OLD 0 #define IPC_64 0x0100 + #endif + |