From: Andrew Morton <akpm@osdl.org>

- `struct kmem_cache_s' is no more in -mm.

- Replace `kmem_cache_t' with the preferred `struct kmem_cache' in slob.c

Cc: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/slab.h |   19 ++++++++++---------
 mm/slob.c            |   30 +++++++++++++++---------------
 proc/proc_misc.c     |    0 
 Kconfig              |    0 
 Makefile             |    0 
 5 files changed, 25 insertions(+), 24 deletions(-)

diff -puN fs/proc/proc_misc.c~slob-introduce-the-slob-allocator-fixes fs/proc/proc_misc.c
diff -puN include/linux/slab.h~slob-introduce-the-slob-allocator-fixes include/linux/slab.h
--- devel/include/linux/slab.h~slob-introduce-the-slob-allocator-fixes	2005-11-04 22:18:11.000000000 -0800
+++ devel-akpm/include/linux/slab.h	2005-11-04 22:18:11.000000000 -0800
@@ -141,19 +141,20 @@ extern int FASTCALL(kmem_ptr_validate(km
 /* SLOB allocator routines */
 
 void kmem_cache_init(void);
-kmem_cache_t *kmem_find_general_cachep(size_t, gfp_t gfpflags);
-kmem_cache_t *kmem_cache_create(const char *c, size_t, size_t, unsigned long,
-	void (*)(void *, kmem_cache_t *, unsigned long),
-	void (*)(void *, kmem_cache_t *, unsigned long));
-int kmem_cache_destroy(kmem_cache_t *c);
-void *kmem_cache_alloc(kmem_cache_t *c, gfp_t flags);
-void kmem_cache_free(kmem_cache_t *c, void *b);
-const char *kmem_cache_name(kmem_cache_t *);
+struct kmem_cache *kmem_find_general_cachep(size_t, gfp_t gfpflags);
+struct kmem_cache *kmem_cache_create(const char *c, size_t, size_t,
+	unsigned long,
+	void (*)(void *, struct kmem_cache *, unsigned long),
+	void (*)(void *, struct kmem_cache *, unsigned long));
+int kmem_cache_destroy(struct kmem_cache *c);
+void *kmem_cache_alloc(struct kmem_cache *c, gfp_t flags);
+void kmem_cache_free(struct kmem_cache *c, void *b);
+const char *kmem_cache_name(struct kmem_cache *);
 void *kmalloc(size_t size, gfp_t flags);
 void *kzalloc(size_t size, gfp_t flags);
 void kfree(const void *m);
 unsigned int ksize(const void *m);
-unsigned int kmem_cache_size(kmem_cache_t *c);
+unsigned int kmem_cache_size(struct kmem_cache *c);
 
 static inline void *kcalloc(size_t n, size_t size, gfp_t flags)
 {
diff -puN init/Kconfig~slob-introduce-the-slob-allocator-fixes init/Kconfig
diff -puN mm/Makefile~slob-introduce-the-slob-allocator-fixes mm/Makefile
diff -puN mm/slob.c~slob-introduce-the-slob-allocator-fixes mm/slob.c
--- devel/mm/slob.c~slob-introduce-the-slob-allocator-fixes	2005-11-04 22:18:11.000000000 -0800
+++ devel-akpm/mm/slob.c	2005-11-04 22:18:11.000000000 -0800
@@ -240,21 +240,21 @@ unsigned int ksize(const void *block)
 	return ((slob_t *)block - 1)->units * SLOB_UNIT;
 }
 
-struct kmem_cache_s {
+struct kmem_cache {
 	unsigned int size, align;
 	const char *name;
-	void (*ctor)(void *, kmem_cache_t *, unsigned long);
-	void (*dtor)(void *, kmem_cache_t *, unsigned long);
+	void (*ctor)(void *, struct kmem_cache *, unsigned long);
+	void (*dtor)(void *, struct kmem_cache *, unsigned long);
 };
 
-kmem_cache_t *kmem_cache_create(const char *name, size_t size, size_t align,
-	unsigned long flags,
-	void (*ctor)(void*, kmem_cache_t *, unsigned long),
-	void (*dtor)(void*, kmem_cache_t *, unsigned long))
+struct kmem_cache *kmem_cache_create(const char *name, size_t size,
+	size_t align, unsigned long flags,
+	void (*ctor)(void*, struct kmem_cache *, unsigned long),
+	void (*dtor)(void*, struct kmem_cache *, unsigned long))
 {
-	kmem_cache_t *c;
+	struct kmem_cache *c;
 
-	c = slob_alloc(sizeof(kmem_cache_t), flags, 0);
+	c = slob_alloc(sizeof(struct kmem_cache), flags, 0);
 
 	if (c) {
 		c->name = name;
@@ -271,14 +271,14 @@ kmem_cache_t *kmem_cache_create(const ch
 }
 EXPORT_SYMBOL(kmem_cache_create);
 
-int kmem_cache_destroy(kmem_cache_t *c)
+int kmem_cache_destroy(struct kmem_cache *c)
 {
-	slob_free(c, sizeof(kmem_cache_t));
+	slob_free(c, sizeof(struct kmem_cache));
 	return 0;
 }
 EXPORT_SYMBOL(kmem_cache_destroy);
 
-void *kmem_cache_alloc(kmem_cache_t *c, gfp_t flags)
+void *kmem_cache_alloc(struct kmem_cache *c, gfp_t flags)
 {
 	void *b;
 
@@ -294,7 +294,7 @@ void *kmem_cache_alloc(kmem_cache_t *c, 
 }
 EXPORT_SYMBOL(kmem_cache_alloc);
 
-void kmem_cache_free(kmem_cache_t *c, void *b)
+void kmem_cache_free(struct kmem_cache *c, void *b)
 {
 	if (c->dtor)
 		c->dtor(b, c, 0);
@@ -306,13 +306,13 @@ void kmem_cache_free(kmem_cache_t *c, vo
 }
 EXPORT_SYMBOL(kmem_cache_free);
 
-unsigned int kmem_cache_size(kmem_cache_t *c)
+unsigned int kmem_cache_size(struct kmem_cache *c)
 {
 	return c->size;
 }
 EXPORT_SYMBOL(kmem_cache_size);
 
-const char *kmem_cache_name(kmem_cache_t *c)
+const char *kmem_cache_name(struct kmem_cache *c)
 {
 	return c->name;
 }
_