Index: linux-2.6.21-rc4-mm1/mm/slub.c
===================================================================
--- linux-2.6.21-rc4-mm1.orig/mm/slub.c	2007-03-20 15:04:17.000000000 -0700
+++ linux-2.6.21-rc4-mm1/mm/slub.c	2007-03-20 15:51:48.000000000 -0700
@@ -229,7 +229,7 @@ static void print_track(const char *s, s
 	} else
 #endif
 	printk(KERN_ERR "%s: 0x%p", s, t->addr);
-	printk(" jiffies since=%d cpu=%d pid=%d\n", t->cpu, t->pid, jiffies - t->when);
+	printk(" jiffies since=%lu cpu=%u pid=%d\n", jiffies - t->when, t->cpu, t->pid);
 }
 
 static void print_trailer(struct kmem_cache *s, u8 *p)
@@ -1219,9 +1219,6 @@ void kmem_cache_free(struct kmem_cache *
 	if (unlikely(PageCompound(page)))
 		page = page->first_page;
 
-	if (!s)
-		s = page->slab;
-
 	slab_free(s, page, x);
 	if (PageError(page) && s->flags & SLAB_STORE_USER)
 			set_tracking(s, x, 1);
@@ -1995,7 +1992,7 @@ void __init kmem_cache_init(void)
 	kmem_size = offsetof(struct kmem_cache, cpu_slab)
 		 + nr_cpu_ids * sizeof(struct page *);
 
-	printk(KERN_INFO "SLUB V5: General Slabs=%ld, HW alignment=%d, "
+	printk(KERN_INFO "SLUB V6: General Slabs=%ld, HW alignment=%d, "
 		"Processors=%d, Nodes=%d\n",
 		(unsigned long)KMALLOC_SHIFT_HIGH + KMALLOC_EXTRAS + 1
 			- KMALLOC_SHIFT_LOW,