diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:00:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:00:26 +0200 |
| commit | 198bb971e256e4167e45e7df643c13ea66f67e3a (patch) | |
| tree | 85b8b2bf6cc78bf0e53a2187ed5796f076922334 /kernel/sched.c | |
| parent | sched: refactor wait_for_completion_timeout() (diff) | |
| parent | Slab: Fix memory leak in fallback_alloc() (diff) | |
| download | wireguard-linux-198bb971e256e4167e45e7df643c13ea66f67e3a.tar.xz wireguard-linux-198bb971e256e4167e45e7df643c13ea66f67e3a.zip | |
Merge branch 'linus' into sched/urgent
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 bebf9788f45e..3aaa5c8cb421 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -6877,7 +6877,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); |