diff --git a/[refs] b/[refs]
index fea86a260a30..42a38dc7c3ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d292c0cc489fa642799494bddbd7c94d11f7bbc1
+refs/heads/master: 30727174b6273c67fa96fb818fe5bdde1ad70e5c
diff --git a/trunk/fs/dlm/config.c b/trunk/fs/dlm/config.c
index 2f8e3c81bc19..c3ad1dff3b25 100644
--- a/trunk/fs/dlm/config.c
+++ b/trunk/fs/dlm/config.c
@@ -604,7 +604,7 @@ static struct clusters clusters_root = {
 	},
 };
 
-int dlm_config_init(void)
+int __init dlm_config_init(void)
 {
 	config_group_init(&clusters_root.subsys.su_group);
 	mutex_init(&clusters_root.subsys.su_mutex);
diff --git a/trunk/fs/dlm/debug_fs.c b/trunk/fs/dlm/debug_fs.c
index 52b11960a175..8fc24f4507a3 100644
--- a/trunk/fs/dlm/debug_fs.c
+++ b/trunk/fs/dlm/debug_fs.c
@@ -541,7 +541,7 @@ void dlm_delete_debug_file(struct dlm_ls *ls)
 		debugfs_remove(ls->ls_debug_locks_dentry);
 }
 
-int dlm_register_debugfs(void)
+int __init dlm_register_debugfs(void)
 {
 	mutex_init(&debug_buf_lock);
 	dlm_root = debugfs_create_dir("dlm", NULL);
diff --git a/trunk/fs/dlm/lockspace.c b/trunk/fs/dlm/lockspace.c
index b180fdc51085..b64e55e0515d 100644
--- a/trunk/fs/dlm/lockspace.c
+++ b/trunk/fs/dlm/lockspace.c
@@ -191,7 +191,7 @@ static int do_uevent(struct dlm_ls *ls, int in)
 }
 
 
-int dlm_lockspace_init(void)
+int __init dlm_lockspace_init(void)
 {
 	ls_count = 0;
 	mutex_init(&ls_lock);
diff --git a/trunk/fs/dlm/memory.c b/trunk/fs/dlm/memory.c
index 65e41e5569b0..54c14c6d06cb 100644
--- a/trunk/fs/dlm/memory.c
+++ b/trunk/fs/dlm/memory.c
@@ -18,7 +18,7 @@
 static struct kmem_cache *lkb_cache;
 
 
-int dlm_memory_init(void)
+int __init dlm_memory_init(void)
 {
 	int ret = 0;
 
diff --git a/trunk/fs/dlm/netlink.c b/trunk/fs/dlm/netlink.c
index 90374b848761..714593621f4f 100644
--- a/trunk/fs/dlm/netlink.c
+++ b/trunk/fs/dlm/netlink.c
@@ -78,7 +78,7 @@ static struct genl_ops dlm_nl_ops = {
 	.doit		= user_cmd,
 };
 
-int dlm_netlink_init(void)
+int __init dlm_netlink_init(void)
 {
 	int rv;
 
@@ -95,7 +95,7 @@ int dlm_netlink_init(void)
 	return rv;
 }
 
-void dlm_netlink_exit(void)
+void __exit dlm_netlink_exit(void)
 {
 	genl_unregister_ops(&family, &dlm_nl_ops);
 	genl_unregister_family(&family);
diff --git a/trunk/fs/dlm/user.c b/trunk/fs/dlm/user.c
index 70b31b914870..ebbcf38fd33b 100644
--- a/trunk/fs/dlm/user.c
+++ b/trunk/fs/dlm/user.c
@@ -902,7 +902,7 @@ static struct miscdevice ctl_device = {
 	.minor = MISC_DYNAMIC_MINOR,
 };
 
-int dlm_user_init(void)
+int __init dlm_user_init(void)
 {
 	int error;