aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/cpuset.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 51f8e1d5a2a9..535dce685eec 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -856,14 +856,15 @@ static int update_cpumask(struct cpuset *cs, struct cpuset *trialcs,
856 if (!cpumask_subset(trialcs->cpus_allowed, cpu_active_mask)) 856 if (!cpumask_subset(trialcs->cpus_allowed, cpu_active_mask))
857 return -EINVAL; 857 return -EINVAL;
858 } 858 }
859 retval = validate_change(cs, trialcs);
860 if (retval < 0)
861 return retval;
862 859
863 /* Nothing to do if the cpus didn't change */ 860 /* Nothing to do if the cpus didn't change */
864 if (cpumask_equal(cs->cpus_allowed, trialcs->cpus_allowed)) 861 if (cpumask_equal(cs->cpus_allowed, trialcs->cpus_allowed))
865 return 0; 862 return 0;
866 863
864 retval = validate_change(cs, trialcs);
865 if (retval < 0)
866 return retval;
867
867 retval = heap_init(&heap, PAGE_SIZE, GFP_KERNEL, NULL); 868 retval = heap_init(&heap, PAGE_SIZE, GFP_KERNEL, NULL);
868 if (retval) 869 if (retval)
869 return retval; 870 return retval;