diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 12:40:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 12:40:15 -0700 |
| commit | 47c317a7aaa2fbac03811a569829fa954e641520 (patch) | |
| tree | e6e20c1d9d73e9b2377e4af8f8381af072f681bb /mm | |
| parent | e89970aa93b06d0605a488e74af3b0a2a80e03b5 (diff) | |
| parent | 0ebd652b35e988c0be3390e49b39cc064ba1cfce (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: dump more data on slab corruption
SLUB: simplify re on_each_cpu()
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slub.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/mm/slub.c b/mm/slub.c index 35ab38a94b4..6d4a49c1ff2 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 } /* |