summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPekka Enberg <penberg@kernel.org>2011-03-20 18:12:03 +0200
committerPekka Enberg <penberg@kernel.org>2011-03-20 18:12:03 +0200
commitc53badd0801728feedfcccae04239410b52b0d03 (patch)
tree016421ec2a618767f01df8cfbf765a4dab3b3629 /include
parent521cb40b0c44418a4fd36dc633f575813d59a43d (diff)
parent865d794d1f144d0f93796840d01696cd70647a8a (diff)
downloadlinux-3.10-c53badd0801728feedfcccae04239410b52b0d03.tar.gz
linux-3.10-c53badd0801728feedfcccae04239410b52b0d03.tar.bz2
linux-3.10-c53badd0801728feedfcccae04239410b52b0d03.zip
Merge branch 'slab/next' into for-linus
Diffstat (limited to 'include')
-rw-r--r--include/linux/slab.h1
-rw-r--r--include/linux/slub_def.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h
index fa9086647eb..ad4dd1c8d30 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -105,7 +105,6 @@ void kmem_cache_destroy(struct kmem_cache *);
int kmem_cache_shrink(struct kmem_cache *);
void kmem_cache_free(struct kmem_cache *, void *);
unsigned int kmem_cache_size(struct kmem_cache *);
-const char *kmem_cache_name(struct kmem_cache *);
/*
* Please use this macro to create slab caches. Simply specify the
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index 8b6e8ae5d5c..ae0093cc518 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -83,6 +83,7 @@ struct kmem_cache {
void (*ctor)(void *);
int inuse; /* Offset to metadata */
int align; /* Alignment */
+ int reserved; /* Reserved bytes at the end of slabs */
unsigned long min_partial;
const char *name; /* Name (only for display!) */
struct list_head list; /* List of slab caches */