return freelist;
 }
 
-static inline unsigned int *slab_bufctl(struct page *page)
+static inline unsigned int *slab_freelist(struct page *page)
 {
        return (unsigned int *)(page->freelist);
 }
                if (cachep->ctor)
                        cachep->ctor(objp);
 #endif
-               slab_bufctl(page)[i] = i;
+               slab_freelist(page)[i] = i;
        }
 }
 
 {
        void *objp;
 
-       objp = index_to_obj(cachep, page, slab_bufctl(page)[page->active]);
+       objp = index_to_obj(cachep, page, slab_freelist(page)[page->active]);
        page->active++;
 #if DEBUG
        WARN_ON(page_to_nid(virt_to_page(objp)) != nodeid);
 
        /* Verify double free bug */
        for (i = page->active; i < cachep->num; i++) {
-               if (slab_bufctl(page)[i] == objnr) {
+               if (slab_freelist(page)[i] == objnr) {
                        printk(KERN_ERR "slab: double free detected in cache "
                                        "'%s', objp %p\n", cachep->name, objp);
                        BUG();
        }
 #endif
        page->active--;
-       slab_bufctl(page)[page->active] = objnr;
+       slab_freelist(page)[page->active] = objnr;
 }
 
 /*
 
                for (j = page->active; j < c->num; j++) {
                        /* Skip freed item */
-                       if (slab_bufctl(page)[j] == i) {
+                       if (slab_freelist(page)[j] == i) {
                                active = false;
                                break;
                        }