summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Chen <miles.chen@mediatek.com>2017-11-15 17:32:10 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-15 18:21:01 -0800
commit9f88faee3ff7d6e8b09c9d23b7d4ac0c15a3eae9 (patch)
tree829cea5144d580e3fe7f04b2ad9b880ee39b33e9
parent852d8be0ad8511611eff18f28dce11d25195b654 (diff)
downloadop-kernel-dev-9f88faee3ff7d6e8b09c9d23b7d4ac0c15a3eae9.zip
op-kernel-dev-9f88faee3ff7d6e8b09c9d23b7d4ac0c15a3eae9.tar.gz
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>
-rw-r--r--mm/slob.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slob.c b/mm/slob.c
index 1024916..3451eca 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;
}
OpenPOWER on IntegriCloud