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/kernel_stat.h | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'libc/kernel/common/linux/kernel_stat.h') diff --git a/libc/kernel/common/linux/kernel_stat.h b/libc/kernel/common/linux/kernel_stat.h index c524e47..f333736 100644 --- a/libc/kernel/common/linux/kernel_stat.h +++ b/libc/kernel/common/linux/kernel_stat.h @@ -7,43 +7,36 @@ *** 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_STAT_H #define _LINUX_KERNEL_STAT_H + #include #include -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #include #include #include #include -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + struct cpu_usage_stat { cputime64_t user; cputime64_t nice; cputime64_t system; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ cputime64_t softirq; cputime64_t irq; cputime64_t idle; cputime64_t iowait; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ cputime64_t steal; }; + struct kernel_stat { struct cpu_usage_stat cpustat; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ unsigned int irqs[NR_IRQS]; }; + #define kstat_cpu(cpu) per_cpu(kstat, cpu) + #define kstat_this_cpu __get_cpu_var(kstat) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + #endif -- cgit v1.1