summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-10-08 18:01:52 +0200
committerTejun Heo <tj@kernel.org>2014-10-08 18:01:52 +0200
commit6ae833c7fe0c6ef1f0ab13cc775da230d6f4c256 (patch)
tree23fc4c7e1ef8a8d97fa039e0da7162c48d08bae7 /mm
parentblk-mq, percpu_ref: start q->mq_usage_counter in atomic mode (diff)
downloadlinux-6ae833c7fe0c6ef1f0ab13cc775da230d6f4c256.tar.xz
linux-6ae833c7fe0c6ef1f0ab13cc775da230d6f4c256.zip
percpu: fix how @gfp is interpreted by the percpu allocator
When @gfp is specified, the percpu allocator is interested in whether it contains all of GFP_KERNEL or not. If it does, the normal allocation path is taken; otherwise, the atomic allocation path. Unfortunately, pcpu_alloc() was incorrectly testing for whether @gfp contains any part of GFP_KERNEL. Fix it by testing "(gfp & GFP_KERNEL) != GFP_KERNEL" instead of "!(gfp & GFP_KERNEL)" to decide whether the allocation should be atomic or not. Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/percpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/percpu.c b/mm/percpu.c
index e10f9f7a8887..014bab65e0ff 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -876,7 +876,7 @@ static void __percpu *pcpu_alloc(size_t size, size_t align, bool reserved,
static int warn_limit = 10;
struct pcpu_chunk *chunk;
const char *err;
- bool is_atomic = !(gfp & GFP_KERNEL);
+ bool is_atomic = (gfp & GFP_KERNEL) != GFP_KERNEL;
int occ_pages = 0;
int slot, off, new_alloc, cpu, ret;
unsigned long flags;