Merge branch 'linus' into sched/devel

1 files changed, 6 insertions, 1 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index 1f711a58a2b4..adb2d01fccc2 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -6919,7 +6919,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);