Commit 47c317a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents e89970aa 0ebd652b

mm/slub.c

+1 −9
Original line number Diff line number Diff line
@@ -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

}



/*