diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-22 02:36:33 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-22 02:36:33 +0200 |
| commit | 03c1b4e8e560455a2634a76998883a22f1a01207 (patch) | |
| tree | 30ca1237d094d66df1dc1533f7bf39b3877b5932 /mm/slab.h | |
| parent | x86, mm: Replace arch_vma_name with vm_ops->name for vsyscalls (diff) | |
| parent | Merge commit '7ed6fb9b5a5510e4ef78ab27419184741169978a' into x86/espfix (diff) | |
| download | linux-03c1b4e8e560455a2634a76998883a22f1a01207.tar.xz linux-03c1b4e8e560455a2634a76998883a22f1a01207.zip | |
Merge remote-tracking branch 'origin/x86/espfix' into x86/vdso
Merge x86/espfix into x86/vdso, due to changes in the vdso setup code
that otherwise cause conflicts.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'mm/slab.h')
| -rw-r--r-- | mm/slab.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/slab.h b/mm/slab.h index 3045316b7c9d..6bd4c353704f 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -91,6 +91,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align, #define CACHE_CREATE_MASK (SLAB_CORE_FLAGS | SLAB_DEBUG_FLAGS | SLAB_CACHE_FLAGS) int __kmem_cache_shutdown(struct kmem_cache *); +void slab_kmem_cache_release(struct kmem_cache *); struct seq_file; struct file; |