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/compiler.h | |
| parent | 94a85f663694e1869acb1c2e8a3c374a6fa3ab86 (diff) | |
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/compiler.h')
| -rw-r--r-- | libc/kernel/common/linux/compiler.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/libc/kernel/common/linux/compiler.h b/libc/kernel/common/linux/compiler.h index 9e6dc4bde..4055e33f7 100644 --- a/libc/kernel/common/linux/compiler.h +++ b/libc/kernel/common/linux/compiler.h @@ -7,39 +7,32 @@ *** 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_COMPILER_H #define __LINUX_COMPILER_H + #ifndef __ASSEMBLY__ + #define __user -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define __kernel #define __safe #define __force #define __nocast -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define __iomem #define __chk_user_ptr(x) (void)0 #define __chk_io_ptr(x) (void)0 #define __builtin_warning(x, y...) (1) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define __acquires(x) #define __releases(x) #define __acquire(x) (void)0 #define __release(x) (void)0 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define __cond_lock(x) (x) + #endif + #ifndef __attribute_const__ #define __attribute_const__ -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #endif + #endif |