diff options
| author | Ben Cheng <bccheng@google.com> | 2012-03-07 13:57:09 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-07 13:57:09 -0800 |
| commit | 27a5923b24a7f0a1a75498bcb6771f380b681e09 (patch) | |
| tree | 9fcee023682e2b28669207e70e1e72fe346f96d4 /libc/kernel/common/linux/kernel.h | |
| parent | e5cf8166dcfeebe50e0981467f93b79ac4f69a4f (diff) | |
| parent | 94a85f663694e1869acb1c2e8a3c374a6fa3ab86 (diff) | |
| download | android_bionic-27a5923b24a7f0a1a75498bcb6771f380b681e09.tar.gz android_bionic-27a5923b24a7f0a1a75498bcb6771f380b681e09.tar.bz2 android_bionic-27a5923b24a7f0a1a75498bcb6771f380b681e09.zip | |
Merge "Update bionic kernel headers using update_all.py"
Diffstat (limited to 'libc/kernel/common/linux/kernel.h')
| -rw-r--r-- | libc/kernel/common/linux/kernel.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/libc/kernel/common/linux/kernel.h b/libc/kernel/common/linux/kernel.h index 9682e473e..608f31ec2 100644 --- a/libc/kernel/common/linux/kernel.h +++ b/libc/kernel/common/linux/kernel.h @@ -7,33 +7,40 @@ *** 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_KERNEL_H #define _LINUX_KERNEL_H - #define SI_LOAD_SHIFT 16 struct sysinfo { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ long uptime; unsigned long loads[3]; unsigned long totalram; unsigned long freeram; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ unsigned long sharedram; unsigned long bufferram; unsigned long totalswap; unsigned long freeswap; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ unsigned short procs; unsigned short pad; unsigned long totalhigh; unsigned long freehigh; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ unsigned int mem_unit; char _f[20-2*sizeof(long)-sizeof(int)]; }; - #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) - +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define BUILD_BUG_ON_ZERO(e) (sizeof(char[1 - 2 * !!(e)]) - 1) - #define __FUNCTION__ (__func__) - #endif |