Re: [MODSLAB 0/7] A modular slab allocator V1

[Christoph Lameter <clameter@sgi.com>]

Some more minor fixes that my newer compiler on the i386 box discovered.


Index: linux-2.6.18-rc4/include/linux/allocator.h
===================================================================
--- linux-2.6.18-rc4.orig/include/linux/allocator.h	2006-08-16 15:42:24.000000000 -0700
+++ linux-2.6.18-rc4/include/linux/allocator.h	2006-08-16 15:42:27.000000000 -0700
@@ -66,7 +66,7 @@
  * a page is freed.
  */
 struct page_allocator *ctor_and_dtor_for_page_allocator
-	(const struct page_allocator *, unsigned long size, void *private,
+	(const struct page_allocator *, unsigned int size, void *private,
 		void (*ctor)(void *, void *, unsigned long),
                 void (*dtor)(void *, void *, unsigned long));
 
Index: linux-2.6.18-rc4/mm/allocator.c
===================================================================
--- linux-2.6.18-rc4.orig/mm/allocator.c	2006-08-16 15:42:24.000000000 -0700
+++ linux-2.6.18-rc4/mm/allocator.c	2006-08-16 15:42:27.000000000 -0700
@@ -123,8 +123,8 @@
 static void page_free_rcu(struct rcu_head *h)
 {
 	struct page *page;
-	struct page_allocator * base;
-	int order = page->index;
+	struct page_allocator *base;
+	int order;
 
  	page = container_of((struct list_head *)h, struct page, lru);
 	base = (void *)page->mapping;
@@ -228,7 +228,7 @@
 
 struct page_allocator *ctor_and_dtor_for_page_allocator
 	(const struct page_allocator *base,
-		size_t size, void *private,
+		unsigned int size, void *private,
 		void (*ctor)(void *, void *, unsigned long),
 		void (*dtor)(void *, void *, unsigned long))
 {
@@ -318,7 +318,7 @@
 	struct slabr *r = (void *) rcu;
 	struct slab_cache *s = r->s;
 	struct rcuified_slab *d = (void *)s->slab_alloc;
-	void *object = (void *)object - d->rcu_offset;
+	void *object = (void *)rcu - d->rcu_offset;
 
 	d->base->free(s, object);
 }
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/