diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 17:37:12 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 17:37:12 +1100 |
| commit | 984f7ef6eff469869f877cbbf26ccba9a7fd9d4a (patch) | |
| tree | d63d1c5122f83b3232d12232aaf9d996562cab95 /include | |
| parent | 059ee860ad4b7aaa04d918ae2b048edeae166923 (diff) | |
| parent | eba9d1652b21f62e22b7a8edfc6c492676fbeb76 (diff) | |
Merge remote branch 'limits/writable_limits'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/posix-timers.h | 2 | ||||
| -rw-r--r-- | include/linux/resource.h | 2 | ||||
| -rw-r--r-- | include/linux/security.h | 9 |
3 files changed, 9 insertions, 4 deletions
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h index 4f71bf4e628c..3e23844a6990 100644 --- a/include/linux/posix-timers.h +++ b/include/linux/posix-timers.h @@ -117,6 +117,6 @@ void set_process_cpu_timer(struct task_struct *task, unsigned int clock_idx, long clock_nanosleep_restart(struct restart_block *restart_block); -void update_rlimit_cpu(unsigned long rlim_new); +void update_rlimit_cpu(struct task_struct *task, unsigned long rlim_new); #endif diff --git a/include/linux/resource.h b/include/linux/resource.h index 40fc7e626082..08beb1aab482 100644 --- a/include/linux/resource.h +++ b/include/linux/resource.h @@ -71,5 +71,7 @@ struct rlimit { #include <asm/resource.h> int getrusage(struct task_struct *p, int who, struct rusage __user *ru); +int do_setrlimit(struct task_struct *tsk, unsigned int resource, + struct rlimit *new_rlim); #endif diff --git a/include/linux/security.h b/include/linux/security.h index 466cbadbd1ef..9c3a43b20ce7 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -1591,7 +1591,8 @@ struct security_operations { int (*task_setnice) (struct task_struct *p, int nice); int (*task_setioprio) (struct task_struct *p, int ioprio); int (*task_getioprio) (struct task_struct *p); - int (*task_setrlimit) (unsigned int resource, struct rlimit *new_rlim); + int (*task_setrlimit) (struct task_struct *p, unsigned int resource, + struct rlimit *new_rlim); int (*task_setscheduler) (struct task_struct *p, int policy, struct sched_param *lp); int (*task_getscheduler) (struct task_struct *p); @@ -1856,7 +1857,8 @@ int security_task_setgroups(struct group_info *group_info); int security_task_setnice(struct task_struct *p, int nice); int security_task_setioprio(struct task_struct *p, int ioprio); int security_task_getioprio(struct task_struct *p); -int security_task_setrlimit(unsigned int resource, struct rlimit *new_rlim); +int security_task_setrlimit(struct task_struct *p, unsigned int resource, + struct rlimit *new_rlim); int security_task_setscheduler(struct task_struct *p, int policy, struct sched_param *lp); int security_task_getscheduler(struct task_struct *p); @@ -2472,7 +2474,8 @@ static inline int security_task_getioprio(struct task_struct *p) return 0; } -static inline int security_task_setrlimit(unsigned int resource, +static inline int security_task_setrlimit(struct task_struct *p, + unsigned int resource, struct rlimit *new_rlim) { return 0; |