From 4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd Mon Sep 17 00:00:00 2001 From: Ben Cheng Date: Wed, 7 Mar 2012 16:14:53 -0800 Subject: 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. --- libc/kernel/common/linux/timer.h | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'libc/kernel/common/linux/timer.h') diff --git a/libc/kernel/common/linux/timer.h b/libc/kernel/common/linux/timer.h index a113997f7..071a75927 100644 --- a/libc/kernel/common/linux/timer.h +++ b/libc/kernel/common/linux/timer.h @@ -7,37 +7,35 @@ *** 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_TIMER_H #define _LINUX_TIMER_H + #include #include -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #include + struct tvec_t_base_s; + struct timer_list { struct list_head entry; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ unsigned long expires; + void (*function)(unsigned long); unsigned long data; + struct tvec_t_base_s *base; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; + #define TIMER_INITIALIZER(_function, _expires, _data) { .function = (_function), .expires = (_expires), .data = (_data), .base = &boot_tvec_bases, } + #define DEFINE_TIMER(_name, _function, _expires, _data) struct timer_list _name = TIMER_INITIALIZER(_function, _expires, _data) + #define try_to_del_timer_sync(t) del_timer(t) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define del_timer_sync(t) del_timer(t) #define del_singleshot_timer_sync(t) del_timer_sync(t) + struct hrtimer; + #endif -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ -- cgit v1.2.3