From b2f4eb637d964a3dcf856edb5498e2af78e16176 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Wed, 6 Dec 2006 20:32:57 -0800
Subject: [PATCH] --- yaml --- r: 42679 b: refs/heads/master c:
 b86c089b83b8ae2bc814db865057768a9ba787b5 h: refs/heads/master i:   42677:
 a5d2de1cfac8619fcfa67f19cf3db47a20003d67   42675:
 31c2f4cfe098f25ef94b2392a60cb58708c34168   42671:
 78d0c09ff642fdd34d36db7384a0b46b27581b79 v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/fs.h   | 2 ++
 trunk/include/linux/slab.h | 3 ---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e4733cef1d99..0f346e89254e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa362a83e78d2e9320da588805cf2a0b53356bc3
+refs/heads/master: b86c089b83b8ae2bc814db865057768a9ba787b5
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index cac7b1ef9543..a8039c8d8cbb 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -1481,6 +1481,8 @@ extern char * getname(const char __user *);
 extern void __init vfs_caches_init_early(void);
 extern void __init vfs_caches_init(unsigned long);
 
+extern struct kmem_cache *names_cachep;
+
 #define __getname()	kmem_cache_alloc(names_cachep, SLAB_KERNEL)
 #define __putname(name) kmem_cache_free(names_cachep, (void *)(name))
 #ifndef CONFIG_AUDITSYSCALL
diff --git a/trunk/include/linux/slab.h b/trunk/include/linux/slab.h
index bfc063ee94e8..e67314e4a0a0 100644
--- a/trunk/include/linux/slab.h
+++ b/trunk/include/linux/slab.h
@@ -308,9 +308,6 @@ static inline void *kcalloc(size_t n, size_t size, gfp_t flags)
 
 #endif /* CONFIG_SLOB */
 
-/* System wide caches */
-extern kmem_cache_t	*names_cachep;
-
 #endif	/* __KERNEL__ */
 
 #endif	/* _LINUX_SLAB_H */