diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-04 12:36:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-04 12:36:54 -0800 |
| commit | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (patch) | |
| tree | 959088bbf10da0d8496b1310fd6f3be6ea11966e /include/linux/resource.h | |
| parent | 14107c750b840d6efd7fdf2f6d513f35e2eb6230 (diff) | |
| parent | 3e10e716abf3c71bdb5d86b8f507f9e72236c9cd (diff) | |
Merge branch 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux
* 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux:
resource: add helpers for fetching rlimits
resource: move kernel function inside __KERNEL__
SECURITY: selinux, fix update_rlimit_cpu parameter
Diffstat (limited to 'include/linux/resource.h')
| -rw-r--r-- | include/linux/resource.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/resource.h b/include/linux/resource.h index 40fc7e62608..f1e914eefea 100644 --- a/include/linux/resource.h +++ b/include/linux/resource.h @@ -3,8 +3,6 @@ #include <linux/time.h> -struct task_struct; - /* * Resource control/accounting header file for linux */ @@ -70,6 +68,12 @@ struct rlimit { */ #include <asm/resource.h> +#ifdef __KERNEL__ + +struct task_struct; + int getrusage(struct task_struct *p, int who, struct rusage __user *ru); +#endif /* __KERNEL__ */ + #endif |