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/resource.h | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'libc/kernel/common/linux/resource.h') diff --git a/libc/kernel/common/linux/resource.h b/libc/kernel/common/linux/resource.h index 3b2941f17..347b52491 100644 --- a/libc/kernel/common/linux/resource.h +++ b/libc/kernel/common/linux/resource.h @@ -7,59 +7,54 @@ *** 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_RESOURCE_H #define _LINUX_RESOURCE_H + #include + struct task_struct; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + #define RUSAGE_SELF 0 #define RUSAGE_CHILDREN (-1) #define RUSAGE_BOTH (-2) + struct rusage { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct timeval ru_utime; struct timeval ru_stime; long ru_maxrss; long ru_ixrss; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ long ru_idrss; long ru_isrss; long ru_minflt; long ru_majflt; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ long ru_nswap; long ru_inblock; long ru_oublock; long ru_msgsnd; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ long ru_msgrcv; long ru_nsignals; long ru_nvcsw; long ru_nivcsw; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; + struct rlimit { unsigned long rlim_cur; unsigned long rlim_max; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; + #define PRIO_MIN (-20) #define PRIO_MAX 20 + #define PRIO_PROCESS 0 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define PRIO_PGRP 1 #define PRIO_USER 2 + #define _STK_LIM (8*1024*1024) + #define MLOCK_LIMIT (8 * PAGE_SIZE) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + #include + #endif -- cgit v1.2.3