summaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-20 21:37:13 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-20 21:37:13 +0200
commit1f1e2ce8a55bac60ff165d353c6b882e750c9092 (patch)
treeb11aaa5baa04ea5ea0ecc549fa1c95430919cd82 /kernel/sched.c
parentMerge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff)
parentsoftlockup: fix NMI hangs due to lock race - 2.6.26-rc regression (diff)
downloadlinux-1f1e2ce8a55bac60ff165d353c6b882e750c9092.tar.xz
linux-1f1e2ce8a55bac60ff165d353c6b882e750c9092.zip
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/sched.c')
-rw-r--r--kernel/sched.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 4a3cb0614158..b048ad8a11af 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -6879,7 +6879,12 @@ static int default_relax_domain_level = -1;
static int __init setup_relax_domain_level(char *str)
{
- default_relax_domain_level = simple_strtoul(str, NULL, 0);
+ unsigned long val;
+
+ val = simple_strtoul(str, NULL, 0);
+ if (val < SD_LV_MAX)
+ default_relax_domain_level = val;
+
return 1;
}
__setup("relax_domain_level=", setup_relax_domain_level);