X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=kernel%2Fsmp.c;h=d903c02223afbaa2776b2610f00ae3def7de442e;hb=60da3efbf1279c7e1b6a8bd1f848626b194748e6;hp=07854477c16447ff87df874b4f117bcafadd4f33;hpb=dbe08116b87cdc2217f11a78b5b70e29068b7efd;p=deliverable%2Flinux.git

diff --git a/kernel/smp.c b/kernel/smp.c
index 07854477c164..d903c02223af 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -669,7 +669,7 @@ void on_each_cpu_cond(bool (*cond_func)(int cpu, void *info),
 	cpumask_var_t cpus;
 	int cpu, ret;
 
-	might_sleep_if(gfp_flags & __GFP_WAIT);
+	might_sleep_if(gfpflags_allow_blocking(gfp_flags));
 
 	if (likely(zalloc_cpumask_var(&cpus, (gfp_flags|__GFP_NOWARN)))) {
 		preempt_disable();