projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into sched/urgent
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
sched.c
diff --git
a/kernel/sched.c
b/kernel/sched.c
index bebf9788f45ee6a4e3a08ab57ed94e1b17acf546..3aaa5c8cb4214586bd283eedc2375baa3dc739c0 100644
(file)
--- 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)
{
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);
return 1;
}
__setup("relax_domain_level=", setup_relax_domain_level);