adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6

Browse source 
* '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()
This commit is contained in:
Linus Torvalds 2008-07-21 12:40:15 -07:00
commit 47c317a7aa
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mm/slub.c
View file

@ -492,7 +492,7 @@ static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p)
if (p > addr + 16) if (p > addr + 16)
print_section("Bytes b4", p - 16, 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) if (s->flags & SLAB_RED_ZONE)
print_section("Redzone", p + s->objsize, 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) static void flush_all(struct kmem_cache *s)
{ {
#ifdef CONFIG_SMP
on_each_cpu(flush_cpu_slab, s, 1); 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
} }
/* /*