diff options
| author | Ben Cheng <bccheng@google.com> | 2012-03-07 16:16:10 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-07 16:16:10 -0800 |
| commit | 36c8c1039fca1c338796c4a8951c31e4fdf1d3b9 (patch) | |
| tree | fc661a73e7311d4b2cfceb47f3eb9228e16ab96b /libc/kernel/common/linux/cache.h | |
| parent | 27a5923b24a7f0a1a75498bcb6771f380b681e09 (diff) | |
| parent | 4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd (diff) | |
| download | android_bionic-36c8c1039fca1c338796c4a8951c31e4fdf1d3b9.tar.gz android_bionic-36c8c1039fca1c338796c4a8951c31e4fdf1d3b9.tar.bz2 android_bionic-36c8c1039fca1c338796c4a8951c31e4fdf1d3b9.zip | |
Merge "Revert "Update bionic kernel headers using update_all.py""
Diffstat (limited to 'libc/kernel/common/linux/cache.h')
| -rw-r--r-- | libc/kernel/common/linux/cache.h | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/libc/kernel/common/linux/cache.h b/libc/kernel/common/linux/cache.h index dca5a3cac..d2818559e 100644 --- a/libc/kernel/common/linux/cache.h +++ b/libc/kernel/common/linux/cache.h @@ -7,52 +7,48 @@ *** 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_CACHE_H #define __LINUX_CACHE_H + #include <linux/kernel.h> #include <asm/cache.h> -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + #ifndef L1_CACHE_ALIGN #define L1_CACHE_ALIGN(x) ALIGN(x, L1_CACHE_BYTES) #endif + #ifndef SMP_CACHE_BYTES -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define SMP_CACHE_BYTES L1_CACHE_BYTES #endif + #ifndef __read_mostly #define __read_mostly -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #endif + #ifndef ____cacheline_aligned #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + #ifndef ____cacheline_aligned_in_smp #define ____cacheline_aligned_in_smp #endif + #ifndef __cacheline_aligned -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define __cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES), __section__(".data.cacheline_aligned"))) #endif + #ifndef __cacheline_aligned_in_smp #define __cacheline_aligned_in_smp -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #endif + #ifndef INTERNODE_CACHE_SHIFT #define INTERNODE_CACHE_SHIFT L1_CACHE_SHIFT #endif -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + #ifndef ____cacheline_internodealigned_in_smp #define ____cacheline_internodealigned_in_smp #endif + #endif -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ |