diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:30:23 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:30:23 +0200 |
commit | 1de8644cc7c826e0c41e52825bd5a12e2e31e6ca (patch) | |
tree | df1e884080599facaf70d2675c480e999da953e1 /kernel/cpuset.c | |
parent | 6c3df25511c2c51f2dd36cc52a8d22363d731793 (diff) | |
parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) |
Merge branch 'linus' into sched/develtip-sched-devel-2008-06-23_09.30_Mon
Diffstat (limited to 'kernel/cpuset.c')
-rw-r--r-- | kernel/cpuset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index fa9702ec1607..64a05da9bc4c 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -1037,8 +1037,8 @@ int current_cpuset_is_being_rebound(void) static int update_relax_domain_level(struct cpuset *cs, s64 val) { - if ((int)val < 0) - val = -1; + if (val < -1 || val >= SD_LV_MAX) + return -EINVAL; if (val != cs->relax_domain_level) { cs->relax_domain_level = val; |