diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 12:37:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 12:37:13 -0700 |
| commit | 1f1e2ce8a55bac60ff165d353c6b882e750c9092 (patch) | |
| tree | b11aaa5baa04ea5ea0ecc549fa1c95430919cd82 /kernel/sched.c | |
| parent | e570dc2a503f8334b700e8483082c675394f53fd (diff) | |
| parent | 9c106c119ebedf624fbd682fd2a4d52e3c8c1a67 (diff) | |
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.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 4a3cb061415..b048ad8a11a 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); |