Hi Linus,

Please pull the latest SLAB git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git for-linus

The tree has one cleanup patch from Alexey and a small fix for SLUB debugging
by me.

I am heading off to OLS (as apprently is Christoph) so expect some downtime
from us SLUB folks this week. In case anyone is wondering, the SLUB defrag
patches have been postponed to 2.6.28 due to lack of time from Christoph.

Pekka

Alexey Dobriyan (1):
SLUB: simplify re on_each_cpu()

Pekka Enberg (1):
slub: dump more data on slab corruption

mm/slub.c | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/mm/slub.c b/mm/slub.c
index 35ab38a..6d4a49c 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -492,7 +492,7 @@ static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p)
if (p > addr + 16)
print_section("Bytes b4", p - 16, 16);

- print_section("Object", p, min(s->objsize, 128));
+ print_section("Object", p, min_t(unsigned long, s->objsize, PAGE_SIZE));

if (s->flags & SLAB_RED_ZONE)
print_section("Redzone", p + s->objsize,
@@ -1495,15 +1495,7 @@ static void flush_cpu_slab(void *d)

static void flush_all(struct kmem_cache *s)
{
-#ifdef CONFIG_SMP
on_each_cpu(flush_cpu_slab, s, 1);
-#else
- unsigned long flags;
-
- local_irq_save(flags);
- flush_cpu_slab(s);
- local_irq_restore(flags);
-#endif
}

/*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/