The patch titled
Subject: mm-slub-query-dynamic-debug_pagealloc-setting-fix
has been removed from the -mm tree. Its filename was
mm-slub-query-dynamic-debug_pagealloc-setting-fix.patch
This patch was dropped because it was folded into mm-slub-query-dynamic-debug_pagealloc-setting.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-slub-query-dynamic-debug_pagealloc-setting-fix
clean up code, per Christian
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Chris Metcalf <cmetcalf@xxxxxxxxxx>
Cc: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxx>
Cc: Takashi Iwai <tiwai@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/slub.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff -puN mm/slub.c~mm-slub-query-dynamic-debug_pagealloc-setting-fix mm/slub.c
--- a/mm/slub.c~mm-slub-query-dynamic-debug_pagealloc-setting-fix
+++ a/mm/slub.c
@@ -254,12 +254,9 @@ static inline void *get_freepointer_safe
{
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;
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-slub-query-dynamic-debug_pagealloc-setting.patch
sound-query-dynamic-debug_pagealloc-setting-fix.patch
mm-page_ref-add-tracepoint-to-track-down-page-reference-manipulation-fix-3-fix.patch
mn10300-c6x-config_generic_bug-must-depend-on-config_bug.patch
arch-mn10300-kernel-fpu-nofpuc-needs-asm-elfh.patch
btrfs-use-radix_tree_iter_retry-fix.patch
sscanf-implement-basic-character-sets-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
