SLUB: Fix debug printks that are missing 0x before %p A couple of places where we do not provide the 0x in front of addresses for debug printks. Signed-off-by: Christoph Lameter Index: linux-2.6.21-rc7-mm2/mm/slub.c =================================================================== --- linux-2.6.21-rc7-mm2.orig/mm/slub.c 2007-04-26 15:18:12.000000000 -0700 +++ linux-2.6.21-rc7-mm2/mm/slub.c 2007-04-26 15:39:03.000000000 -0700 @@ -2591,7 +2591,7 @@ static void resiliency_test(void) p = kzalloc(16, GFP_KERNEL); p[16] = 0x12; printk(KERN_ERR "\n1. kmalloc-16: Clobber Redzone/next pointer" - " 0x12->%p\n\n", p + 16); + " 0x12->0x%p\n\n", p + 16); validate_slab_cache(kmalloc_caches + 4); @@ -2599,14 +2599,14 @@ static void resiliency_test(void) p = kzalloc(32, GFP_KERNEL); p[32 + sizeof(void *)] = 0x34; printk(KERN_ERR "\n2. kmalloc-32: Clobber next pointer/next slab" - " 0x34 -> %p\n", p); + " 0x34 -> -0x%p\n", p); printk(KERN_ERR "If allocated object is overwritten then not detectable\n\n"); validate_slab_cache(kmalloc_caches + 5); p = kzalloc(64, GFP_KERNEL); p += 64 + (get_cycles() & 0xff) * sizeof(void *); *p = 0x56; - printk(KERN_ERR "\n3. kmalloc-64: corrupting random byte 0x56->%p\n", + printk(KERN_ERR "\n3. kmalloc-64: corrupting random byte 0x56->0x%p\n", p); printk(KERN_ERR "If allocated object is overwritten then not detectable\n\n"); validate_slab_cache(kmalloc_caches + 6); @@ -2615,19 +2615,19 @@ static void resiliency_test(void) p = kzalloc(128, GFP_KERNEL); kfree(p); *p = 0x78; - printk(KERN_ERR "1. kmalloc-128: Clobber first word 0x78->%p\n\n", p); + printk(KERN_ERR "1. kmalloc-128: Clobber first word 0x78->0x%p\n\n", p); validate_slab_cache(kmalloc_caches + 7); p = kzalloc(256, GFP_KERNEL); kfree(p); p[50] = 0x9a; - printk(KERN_ERR "\n2. kmalloc-256: Clobber 50th byte 0x9a->%p\n\n", p); + printk(KERN_ERR "\n2. kmalloc-256: Clobber 50th byte 0x9a->0x%p\n\n", p); validate_slab_cache(kmalloc_caches + 8); p = kzalloc(512, GFP_KERNEL); kfree(p); p[512] = 0xab; - printk(KERN_ERR "\n3. kmalloc-512: Clobber redzone 0xab->%p\n\n", p); + printk(KERN_ERR "\n3. kmalloc-512: Clobber redzone 0xab->0x%p\n\n", p); validate_slab_cache(kmalloc_caches + 9); } #else @@ -2694,17 +2694,17 @@ static void validate_slab_slab(struct km validate_slab(s, page); slab_unlock(page); } else - printk(KERN_INFO "SLUB %s: Skipped busy slab %p\n", + printk(KERN_INFO "SLUB %s: Skipped busy slab 0x%p\n", s->name, page); if (s->flags & DEBUG_DEFAULT_FLAGS) { if (!PageError(page)) printk(KERN_ERR "SLUB %s: PageError not set " - "on slab %p\n", s->name, page); + "on slab 0x%p\n", s->name, page); } else { if (PageError(page)) printk(KERN_ERR "SLUB %s: PageError set on " - "slab %p\n", s->name, page); + "slab 0x%p\n", s->name, page); } }