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/circ_buf.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/circ_buf.h')
-rw-r--r-- | libc/kernel/common/linux/circ_buf.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/libc/kernel/common/linux/circ_buf.h b/libc/kernel/common/linux/circ_buf.h index 262e1634d..438250cfc 100644 --- a/libc/kernel/common/linux/circ_buf.h +++ b/libc/kernel/common/linux/circ_buf.h @@ -7,27 +7,23 @@ *** 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_CIRC_BUF_H #define _LINUX_CIRC_BUF_H 1 + struct circ_buf { char *buf; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int head; int tail; }; + #define CIRC_CNT(head,tail,size) (((head) - (tail)) & ((size)-1)) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + #define CIRC_SPACE(head,tail,size) CIRC_CNT((tail),((head)+1),(size)) + #define CIRC_CNT_TO_END(head,tail,size) ({int end = (size) - (tail); int n = ((head) + end) & ((size)-1); n < end ? n : end;}) + #define CIRC_SPACE_TO_END(head,tail,size) ({int end = (size) - 1 - (head); int n = (end + (tail)) & ((size)-1); n <= end ? n : end+1;}) + #endif -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ |