vserver 1.9.3

[linux-2.6.git] / include / linux / slab.h

diff --git a/include/linux/slab.h b/include/linux/slab.h
index e60ff63..e51014c 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -4,7 +4,7 @@
  * (markhe@nextd.demon.co.uk)
  */
 
-#if    !defined(_LINUX_SLAB_H)
+#ifndef _LINUX_SLAB_H
 #define        _LINUX_SLAB_H
 
 #if    defined(__KERNEL__)
@@ -45,6 +45,7 @@ typedef struct kmem_cache_s kmem_cache_t;
 #define SLAB_RECLAIM_ACCOUNT   0x00020000UL    /* track pages allocated to indicate
                                                   what is reclaimable later*/
 #define SLAB_PANIC             0x00040000UL    /* panic if kmem_cache_create() fails */
+#define SLAB_DESTROY_BY_RCU    0x00080000UL    /* defer freeing pages to RCU */
 
 /* flags passed to a constructor func */
 #define        SLAB_CTOR_CONSTRUCTOR   0x001UL         /* if not set, then deconstructor */
@@ -54,7 +55,6 @@ typedef struct kmem_cache_s kmem_cache_t;
 /* prototypes */
 extern void kmem_cache_init(void);
 
-extern kmem_cache_t *kmem_find_general_cachep(size_t, int gfpflags);
 extern kmem_cache_t *kmem_cache_create(const char *, size_t, size_t, unsigned long,
                                       void (*)(void *, kmem_cache_t *, unsigned long),
                                       void (*)(void *, kmem_cache_t *, unsigned long));
@@ -97,6 +97,7 @@ found:
        return __kmalloc(size, flags);
 }
 
+extern void *kcalloc(size_t, size_t, int);
 extern void kfree(const void *);
 extern unsigned int ksize(const void *);
 
@@ -115,8 +116,6 @@ extern kmem_cache_t *signal_cachep;
 extern kmem_cache_t    *sighand_cachep;
 extern kmem_cache_t    *bio_cachep;
 
-void ptrinfo(unsigned long addr);
-
 extern atomic_t slab_reclaim_pages;
 
 #endif /* __KERNEL__ */