projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-block.git]
/
kernel
/
smp.c
diff --git
a/kernel/smp.c
b/kernel/smp.c
index 07854477c16447ff87df874b4f117bcafadd4f33..d903c02223afbaa2776b2610f00ae3def7de442e 100644
(file)
--- 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(gfp
flags_allow_blocking(gfp_flags)
);
if (likely(zalloc_cpumask_var(&cpus, (gfp_flags|__GFP_NOWARN)))) {
preempt_disable();