summaryrefslogtreecommitdiffstats
path: root/kernel/cpuset.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-20 12:37:13 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-20 12:37:13 -0700
commit1f1e2ce8a55bac60ff165d353c6b882e750c9092 (patch)
treeb11aaa5baa04ea5ea0ecc549fa1c95430919cd82 /kernel/cpuset.c
parente570dc2a503f8334b700e8483082c675394f53fd (diff)
parent9c106c119ebedf624fbd682fd2a4d52e3c8c1a67 (diff)
downloadop-kernel-dev-1f1e2ce8a55bac60ff165d353c6b882e750c9092.zip
op-kernel-dev-1f1e2ce8a55bac60ff165d353c6b882e750c9092.tar.gz
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: softlockup: fix NMI hangs due to lock race - 2.6.26-rc regression rcupreempt: remove export of rcu_batches_completed_bh cpuset: limit the input of cpuset.sched_relax_domain_level
Diffstat (limited to 'kernel/cpuset.c')
-rw-r--r--kernel/cpuset.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index bceb895..9fceb97 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -1037,8 +1037,8 @@ int current_cpuset_is_being_rebound(void)
static int update_relax_domain_level(struct cpuset *cs, s64 val)
{
- if ((int)val < 0)
- val = -1;
+ if (val < -1 || val >= SD_LV_MAX)
+ return -EINVAL;
if (val != cs->relax_domain_level) {
cs->relax_domain_level = val;
OpenPOWER on IntegriCloud