From: tip-bot for Dongsheng Yang <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
peterz@infradead.org, tglx@linutronix.de,
yangds.fnst@cn.fujitsu.com
Subject: [tip:sched/core] sched: Replace hardcoding of -20 and 19 with MIN_NICE and MAX_NICE
Date: Sat, 22 Feb 2014 10:03:57 -0800 [thread overview]
Message-ID: <tip-75e45d512f257beedae0d8a67d053cde5537bd4c@git.kernel.org> (raw)
In-Reply-To: <bd80780f19b4f9b4a765acc353c8dbc130274dd6.1392103744.git.yangds.fnst@cn.fujitsu.com>
Commit-ID: 75e45d512f257beedae0d8a67d053cde5537bd4c
Gitweb: http://git.kernel.org/tip/75e45d512f257beedae0d8a67d053cde5537bd4c
Author: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
AuthorDate: Tue, 11 Feb 2014 15:34:50 +0800
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Sat, 22 Feb 2014 18:15:54 +0100
sched: Replace hardcoding of -20 and 19 with MIN_NICE and MAX_NICE
Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/bd80780f19b4f9b4a765acc353c8dbc130274dd6.1392103744.git.yangds.fnst@cn.fujitsu.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/sched/auto_group.c | 2 +-
kernel/sched/core.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
index 4a07353..e73efba 100644
--- a/kernel/sched/auto_group.c
+++ b/kernel/sched/auto_group.c
@@ -203,7 +203,7 @@ int proc_sched_autogroup_set_nice(struct task_struct *p, int nice)
struct autogroup *ag;
int err;
- if (nice < -20 || nice > 19)
+ if (nice < MIN_NICE || nice > MAX_NICE)
return -EINVAL;
err = security_task_setnice(current, nice);
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index cc4965e..a8a73b8 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2993,7 +2993,7 @@ void set_user_nice(struct task_struct *p, long nice)
unsigned long flags;
struct rq *rq;
- if (task_nice(p) == nice || nice < -20 || nice > 19)
+ if (task_nice(p) == nice || nice < MIN_NICE || nice > MAX_NICE)
return;
/*
* We have to be careful, if called from sys_setpriority(),
@@ -3072,10 +3072,10 @@ SYSCALL_DEFINE1(nice, int, increment)
increment = 40;
nice = task_nice(current) + increment;
- if (nice < -20)
- nice = -20;
- if (nice > 19)
- nice = 19;
+ if (nice < MIN_NICE)
+ nice = MIN_NICE;
+ if (nice > MAX_NICE)
+ nice = MAX_NICE;
if (increment < 0 && !can_nice(current, nice))
return -EPERM;
@@ -3623,7 +3623,7 @@ static int sched_copy_attr(struct sched_attr __user *uattr,
* XXX: do we want to be lenient like existing syscalls; or do we want
* to be strict and return an error on out-of-bounds values?
*/
- attr->sched_nice = clamp(attr->sched_nice, -20, 19);
+ attr->sched_nice = clamp(attr->sched_nice, MIN_NICE, MAX_NICE);
out:
return ret;
next prev parent reply other threads:[~2014-02-22 18:04 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-11 7:34 [PATCH 0/9] Add MAX_NICE, MIN_NICE and NICE_WIDTH macros in prio.h Dongsheng Yang
2014-02-11 7:34 ` [PATCH 1/9] sched: Prio: Use DEFAULT_PRIO to define NICE_TO_PRIO and PRIO_TO_NICE Dongsheng Yang
2014-02-21 21:32 ` [tip:sched/core] " tip-bot for Dongsheng Yang
2014-02-22 18:03 ` [tip:sched/core] sched/prio: Use DEFAULT_PRIO to define NICE_TO_PRIO() and PRIO_TO_NICE() tip-bot for Dongsheng Yang
2014-02-11 7:34 ` [PATCH 2/9] sched: prio: Add 3 macros of MAX_NICE, MIN_NICE and NICE_WIDTH in prio.h Dongsheng Yang
2014-02-21 21:33 ` [tip:sched/core] " tip-bot for Dongsheng Yang
2014-02-22 18:03 ` [tip:sched/core] sched/prio: " tip-bot for Dongsheng Yang
2014-02-11 7:34 ` [PATCH 3/9] sched: prio: Use NICE_WIDTH macro to avoid using of hard coding of 40 and 20 " Dongsheng Yang
2014-02-21 21:33 ` [tip:sched/core] " tip-bot for Dongsheng Yang
2014-02-11 7:34 ` [PATCH 4/9] sched: prio: Add spaces before and after operator of '-' Dongsheng Yang
2014-02-21 21:33 ` [tip:sched/core] " tip-bot for Dongsheng Yang
2014-02-11 7:34 ` [PATCH 5/9] rcu: Use MAX_NICE to replace hard coding of 19 Dongsheng Yang
2014-02-11 15:37 ` Josh Triplett
2014-02-11 16:13 ` Paul E. McKenney
2014-02-11 16:42 ` Peter Zijlstra
2014-02-11 17:42 ` Paul E. McKenney
2014-02-21 21:33 ` [tip:sched/core] " tip-bot for Dongsheng Yang
2014-02-22 18:03 ` [tip:sched/core] rcu: Use MAX_NICE to replace hardcoding " tip-bot for Dongsheng Yang
2014-02-11 7:34 ` [PATCH 6/9] sched: Replace hardcoding of -20 and 19 with MIN_NICE and MAX_NICE Dongsheng Yang
2014-02-21 21:33 ` [tip:sched/core] " tip-bot for Dongsheng Yang
2014-02-22 18:03 ` tip-bot for Dongsheng Yang [this message]
2014-02-11 7:34 ` [PATCH 7/9] sys: " Dongsheng Yang
2014-02-11 18:27 ` Kees Cook
2014-02-12 3:59 ` Dongsheng Yang
2014-02-12 6:40 ` Kees Cook
2014-02-21 21:34 ` [tip:sched/core] " tip-bot for Dongsheng Yang
2014-02-22 18:04 ` tip-bot for Dongsheng Yang
2014-02-11 7:34 ` [PATCH 8/9] workqueue: " Dongsheng Yang
2014-02-11 17:50 ` Tejun Heo
2014-02-21 21:34 ` [tip:sched/core] " tip-bot for Dongsheng Yang
2014-02-22 18:04 ` tip-bot for Dongsheng Yang
2014-02-11 7:34 ` [PATCH 9/9] trace: Replace hardcoding of 19 with MAX_NICE Dongsheng Yang
2014-02-22 9:05 ` Dongsheng Yang
2014-02-22 9:27 ` Peter Zijlstra
2014-02-24 10:46 ` Peter Zijlstra
2014-02-24 14:08 ` Dongsheng Yang
2014-02-24 14:12 ` [PATCH Resend] " Dongsheng Yang
2014-02-24 14:22 ` Peter Zijlstra
2014-02-24 14:29 ` Steven Rostedt
2014-02-24 14:48 ` Peter Zijlstra
2014-02-27 13:33 ` [tip:sched/core] " tip-bot for Dongsheng Yang
2014-02-14 9:22 ` [PATCH 0/9] Add MAX_NICE, MIN_NICE and NICE_WIDTH macros in prio.h Dongsheng Yang
2014-02-14 9:51 ` Peter Zijlstra
2014-02-14 9:54 ` Dongsheng Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-75e45d512f257beedae0d8a67d053cde5537bd4c@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=yangds.fnst@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.