summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorDongsheng Yang <yangds.fnst@cn.fujitsu.com>2014-05-08 09:35:15 (GMT)
committerIngo Molnar <mingo@kernel.org>2014-05-22 09:16:31 (GMT)
commita9467fa3cd2d5bf39e7cb7d0706d29d7ef4df212 (patch)
tree3cdc0ddf76f3b081ba3b5a2b061638595d117a33 /kernel
parentcaffcdd8d27ba78730d5540396ce72ad022aff2c (diff)
downloadlinux-a9467fa3cd2d5bf39e7cb7d0706d29d7ef4df212.tar.xz
sched: Use clamp() and clamp_val() to make sys_nice() more readable
Suggested-by: Kees Cook <keescook@chromium.org> Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1399541715-19568-1-git-send-email-yangds.fnst@cn.fujitsu.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched/core.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 6340c60..f5605b6 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3057,17 +3057,10 @@ SYSCALL_DEFINE1(nice, int, increment)
* We don't have to worry. Conceptually one call occurs first
* and we have a single winner.
*/
- if (increment < -40)
- increment = -40;
- if (increment > 40)
- increment = 40;
-
+ increment = clamp(increment, -NICE_WIDTH, NICE_WIDTH);
nice = task_nice(current) + increment;
- if (nice < MIN_NICE)
- nice = MIN_NICE;
- if (nice > MAX_NICE)
- nice = MAX_NICE;
+ nice = clamp_val(nice, MIN_NICE, MAX_NICE);
if (increment < 0 && !can_nice(current, nice))
return -EPERM;