From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 9 Feb 2016 23:12:47 +0000 (+1100)
Subject: mm-slub-query-dynamic-debug_pagealloc-setting-fix
X-Git-Tag: next-20160210~3^2~172
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e1fd8c8777d002109b59b3be276cedfb73846f70;p=karo-tx-linux.git

mm-slub-query-dynamic-debug_pagealloc-setting-fix

clean up code, per Christian

Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Chris Metcalf <cmetcalf@ezchip.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Takashi Iwai <tiwai@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/slub.c b/mm/slub.c
index cfcec627ca51..0f7e9e94e57c 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -250,12 +250,9 @@ static inline void *get_freepointer_safe(struct kmem_cache *s, void *object)
 {
 	void *p;
 
-	if (debug_pagealloc_enabled()) {
-		probe_kernel_read(&p,
-			(void **)(object + s->offset), sizeof(p));
-	} else
-		p = get_freepointer(s, object);
-
+	if (!debug_pagealloc_enabled())
+		return get_freepointer(s, object);
+	probe_kernel_read(&p, (void **)(object + s->offset), sizeof(p));
 	return p;
 }