From 9ee1c4352fba0d8bf943ee8c59441e6d91e6cbd9 Mon Sep 17 00:00:00 2001
From: Lachlan McIlroy <lachlan@sgi.com>
Date: Wed, 6 Feb 2008 13:37:56 +1100
Subject: [PATCH] --- yaml --- r: 84493 b: refs/heads/master c:
 de2eeea609b55e8c3994133a565b39edeaaaaf69 h: refs/heads/master i:   84491:
 a9a3f7190a894e6485b63a5d6b948affb8a39373 v: v3

---
 [refs]                             | 2 +-
 trunk/fs/xfs/linux-2.6/xfs_super.c | 2 +-
 trunk/fs/xfs/linux-2.6/xfs_vnode.c | 2 +-
 trunk/fs/xfs/support/ktrace.c      | 4 ++--
 trunk/fs/xfs/support/uuid.c        | 2 +-
 trunk/fs/xfs/xfs_vfsops.c          | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f78084eabefa..e4c166d3e3fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 450790a2c51e6d9d47ed30dbdcf486656b8e186f
+refs/heads/master: de2eeea609b55e8c3994133a565b39edeaaaaf69
diff --git a/trunk/fs/xfs/linux-2.6/xfs_super.c b/trunk/fs/xfs/linux-2.6/xfs_super.c
index 56b6c6985d90..21dfc9da235e 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_super.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_super.c
@@ -849,7 +849,7 @@ xfs_fs_inode_init_once(
 	inode_init_once(vn_to_inode((bhv_vnode_t *)vnode));
 }
 
-STATIC int
+STATIC int __init
 xfs_init_zones(void)
 {
 	xfs_vnode_zone = kmem_zone_init_flags(sizeof(bhv_vnode_t), "xfs_vnode",
diff --git a/trunk/fs/xfs/linux-2.6/xfs_vnode.c b/trunk/fs/xfs/linux-2.6/xfs_vnode.c
index 44a48ef90073..bc7afe007338 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_vnode.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_vnode.c
@@ -40,7 +40,7 @@
 #define vptosync(v)             (&vsync[((unsigned long)v) % NVSYNC])
 static wait_queue_head_t vsync[NVSYNC];
 
-void
+void __init
 vn_init(void)
 {
 	int i;
diff --git a/trunk/fs/xfs/support/ktrace.c b/trunk/fs/xfs/support/ktrace.c
index 119611ec21d3..129067cfcb86 100644
--- a/trunk/fs/xfs/support/ktrace.c
+++ b/trunk/fs/xfs/support/ktrace.c
@@ -21,7 +21,7 @@ static kmem_zone_t *ktrace_hdr_zone;
 static kmem_zone_t *ktrace_ent_zone;
 static int          ktrace_zentries;
 
-void
+void __init
 ktrace_init(int zentries)
 {
 	ktrace_zentries = zentries;
@@ -36,7 +36,7 @@ ktrace_init(int zentries)
 	ASSERT(ktrace_ent_zone);
 }
 
-void
+void __exit
 ktrace_uninit(void)
 {
 	kmem_zone_destroy(ktrace_hdr_zone);
diff --git a/trunk/fs/xfs/support/uuid.c b/trunk/fs/xfs/support/uuid.c
index e157015c70ff..493a6ecf8590 100644
--- a/trunk/fs/xfs/support/uuid.c
+++ b/trunk/fs/xfs/support/uuid.c
@@ -133,7 +133,7 @@ uuid_table_remove(uuid_t *uuid)
 	mutex_unlock(&uuid_monitor);
 }
 
-void
+void __init
 uuid_init(void)
 {
 	mutex_init(&uuid_monitor);
diff --git a/trunk/fs/xfs/xfs_vfsops.c b/trunk/fs/xfs/xfs_vfsops.c
index be4e0daaf6bd..413587f02155 100644
--- a/trunk/fs/xfs/xfs_vfsops.c
+++ b/trunk/fs/xfs/xfs_vfsops.c
@@ -58,7 +58,7 @@
 #include "xfs_vfsops.h"
 
 
-int
+int __init
 xfs_init(void)
 {
 #ifdef XFS_DABUF_DEBUG
@@ -147,7 +147,7 @@ xfs_init(void)
 	return 0;
 }
 
-void
+void __exit
 xfs_cleanup(void)
 {
 	extern kmem_zone_t	*xfs_inode_zone;