summaryrefslogtreecommitdiffstats
path: root/mm/slob.c
diff options
context:
space:
mode:
authorMiles Chen2017-11-16 02:32:10 +0100
committerLinus Torvalds2017-11-16 03:21:01 +0100
commit9f88faee3ff7d6e8b09c9d23b7d4ac0c15a3eae9 (patch)
tree829cea5144d580e3fe7f04b2ad9b880ee39b33e9 /mm/slob.c
parentmm: oom: show unreclaimable slab info when unreclaimable slabs > user memory (diff)
downloadkernel-qcow2-linux-9f88faee3ff7d6e8b09c9d23b7d4ac0c15a3eae9.tar.gz
kernel-qcow2-linux-9f88faee3ff7d6e8b09c9d23b7d4ac0c15a3eae9.tar.xz
kernel-qcow2-linux-9f88faee3ff7d6e8b09c9d23b7d4ac0c15a3eae9.zip
mm/slob.c: remove an unnecessary check for __GFP_ZERO
Current flow guarantees a valid pointer when handling the __GFP_ZERO case. So remove the unnecessary NULL pointer check. Link: http://lkml.kernel.org/r/1507203141-11959-1-git-send-email-miles.chen@mediatek.com Signed-off-by: Miles Chen <miles.chen@mediatek.com> Cc: Christoph Lameter <cl@linux.com> Cc: Pekka Enberg <penberg@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/slob.c')
-rw-r--r--mm/slob.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slob.c b/mm/slob.c
index 10249160b693..3451ecad8e35 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -330,7 +330,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
BUG_ON(!b);
spin_unlock_irqrestore(&slob_lock, flags);
}
- if (unlikely((gfp & __GFP_ZERO) && b))
+ if (unlikely(gfp & __GFP_ZERO))
memset(b, 0, size);
return b;
}