diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-generic/resource.h | 7 | ||||
-rw-r--r-- | include/linux/sched.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-generic/resource.h b/include/asm-generic/resource.h index b1fcda9eac23..cfe3692b23e5 100644 --- a/include/asm-generic/resource.h +++ b/include/asm-generic/resource.h | |||
@@ -41,8 +41,11 @@ | |||
41 | #define RLIMIT_LOCKS 10 /* maximum file locks held */ | 41 | #define RLIMIT_LOCKS 10 /* maximum file locks held */ |
42 | #define RLIMIT_SIGPENDING 11 /* max number of pending signals */ | 42 | #define RLIMIT_SIGPENDING 11 /* max number of pending signals */ |
43 | #define RLIMIT_MSGQUEUE 12 /* maximum bytes in POSIX mqueues */ | 43 | #define RLIMIT_MSGQUEUE 12 /* maximum bytes in POSIX mqueues */ |
44 | #define RLIMIT_NICE 13 /* max nice prio allowed to raise to | ||
45 | 0-39 for nice level 19 .. -20 */ | ||
46 | #define RLIMIT_RTPRIO 14 /* maximum realtime priority */ | ||
44 | 47 | ||
45 | #define RLIM_NLIMITS 13 | 48 | #define RLIM_NLIMITS 15 |
46 | 49 | ||
47 | /* | 50 | /* |
48 | * SuS says limits have to be unsigned. | 51 | * SuS says limits have to be unsigned. |
@@ -81,6 +84,8 @@ | |||
81 | [RLIMIT_LOCKS] = { RLIM_INFINITY, RLIM_INFINITY }, \ | 84 | [RLIMIT_LOCKS] = { RLIM_INFINITY, RLIM_INFINITY }, \ |
82 | [RLIMIT_SIGPENDING] = { 0, 0 }, \ | 85 | [RLIMIT_SIGPENDING] = { 0, 0 }, \ |
83 | [RLIMIT_MSGQUEUE] = { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ | 86 | [RLIMIT_MSGQUEUE] = { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ |
87 | [RLIMIT_NICE] = { 0, 0 }, \ | ||
88 | [RLIMIT_RTPRIO] = { 0, 0 }, \ | ||
84 | } | 89 | } |
85 | 90 | ||
86 | #endif /* __KERNEL__ */ | 91 | #endif /* __KERNEL__ */ |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 1cced971232c..8960f99ea128 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -845,6 +845,7 @@ extern void sched_idle_next(void); | |||
845 | extern void set_user_nice(task_t *p, long nice); | 845 | extern void set_user_nice(task_t *p, long nice); |
846 | extern int task_prio(const task_t *p); | 846 | extern int task_prio(const task_t *p); |
847 | extern int task_nice(const task_t *p); | 847 | extern int task_nice(const task_t *p); |
848 | extern int can_nice(const task_t *p, const int nice); | ||
848 | extern int task_curr(const task_t *p); | 849 | extern int task_curr(const task_t *p); |
849 | extern int idle_cpu(int cpu); | 850 | extern int idle_cpu(int cpu); |
850 | extern int sched_setscheduler(struct task_struct *, int, struct sched_param *); | 851 | extern int sched_setscheduler(struct task_struct *, int, struct sched_param *); |