The patch titled
Subject: [PATCH] slab: Fix slab debug for non alien caches.
has been added to the -mm tree. Its filename is
slab-fix-slab-debug-for-non-alien-caches.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Subject: [PATCH] slab: Fix slab debug for non alien caches.
From: Paul Mundt <lethal@xxxxxxxxxxxx>
Currently when slab debugging is enabled, the WARN_ON() nodeid checks
trigger if we boot with 'noaliencache'. In the noaliencache case the
WARN_ON()'s seem to be superfluous, so only bother doing the nodeid
comparison if use_alien_caches is set.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
Cc: Christoph Lameter <clameter@xxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/slab.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN mm/slab.c~slab-fix-slab-debug-for-non-alien-caches mm/slab.c
--- a/mm/slab.c~slab-fix-slab-debug-for-non-alien-caches
+++ a/mm/slab.c
@@ -2663,7 +2663,7 @@ static void *slab_get_obj(struct kmem_ca
next = slab_bufctl(slabp)[slabp->free];
#if DEBUG
slab_bufctl(slabp)[slabp->free] = BUFCTL_FREE;
- WARN_ON(slabp->nodeid != nodeid);
+ WARN_ON(use_alien_caches && slabp->nodeid != nodeid);
#endif
slabp->free = next;
@@ -2677,7 +2677,7 @@ static void slab_put_obj(struct kmem_cac
#if DEBUG
/* Verify that the slab belongs to the intended node */
- WARN_ON(slabp->nodeid != nodeid);
+ WARN_ON(use_alien_caches && slabp->nodeid != nodeid);
if (slab_bufctl(slabp)[objnr] + 1 <= SLAB_LIMIT + 1) {
printk(KERN_ERR "slab: double free detected in cache "
_
Patches currently in -mm which might be from lethal@xxxxxxxxxxxx are
lots-of-architectures-enable-arbitary-speed-tty-support.patch
git-sh.patch
sh-support-older-gccs.patch
slab-fix-slab-debug-for-non-alien-caches.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
