From 4cb922246e7db07596acb61cc5792f8a05b802ed Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Sun, 17 Feb 2008 22:33:57 -0800
Subject: [PATCH] --- yaml --- r: 85837 b: refs/heads/master c:
 05705e4e1158ad2c1a22817f27d91ff0758fd0a9 h: refs/heads/master i:   85835:
 bd2dd2e45815f8c5c79229e7791043ba54e2dbc8 v: v3

---
 [refs]                                   | 2 +-
 trunk/net/netlabel/netlabel_cipso_v4.c   | 2 +-
 trunk/net/netlabel/netlabel_domainhash.c | 2 +-
 trunk/net/netlabel/netlabel_mgmt.c       | 2 +-
 trunk/net/netlabel/netlabel_unlabeled.c  | 6 +++---
 trunk/net/netlabel/netlabel_user.c       | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 4f6dccbb4a00..6ed11eeea2b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 227c43c3bca76df704231324405980851dc7f528
+refs/heads/master: 05705e4e1158ad2c1a22817f27d91ff0758fd0a9
diff --git a/trunk/net/netlabel/netlabel_cipso_v4.c b/trunk/net/netlabel/netlabel_cipso_v4.c
index 283ff4a527fd..fdc14a0d21af 100644
--- a/trunk/net/netlabel/netlabel_cipso_v4.c
+++ b/trunk/net/netlabel/netlabel_cipso_v4.c
@@ -761,7 +761,7 @@ static struct genl_ops netlbl_cipsov4_ops[] = {
  * mechanism.  Returns zero on success, negative values on failure.
  *
  */
-int netlbl_cipsov4_genl_init(void)
+int __init netlbl_cipsov4_genl_init(void)
 {
 	int ret_val, i;
 
diff --git a/trunk/net/netlabel/netlabel_domainhash.c b/trunk/net/netlabel/netlabel_domainhash.c
index fd462313471c..02c2f7c0b255 100644
--- a/trunk/net/netlabel/netlabel_domainhash.c
+++ b/trunk/net/netlabel/netlabel_domainhash.c
@@ -171,7 +171,7 @@ static struct netlbl_dom_map *netlbl_domhsh_search_def(const char *domain)
  * values on error.
  *
  */
-int netlbl_domhsh_init(u32 size)
+int __init netlbl_domhsh_init(u32 size)
 {
 	u32 iter;
 	struct netlbl_domhsh_tbl *hsh_tbl;
diff --git a/trunk/net/netlabel/netlabel_mgmt.c b/trunk/net/netlabel/netlabel_mgmt.c
index 05d98862fbd4..22c191267808 100644
--- a/trunk/net/netlabel/netlabel_mgmt.c
+++ b/trunk/net/netlabel/netlabel_mgmt.c
@@ -588,7 +588,7 @@ static struct genl_ops netlbl_mgmt_genl_ops[] = {
  * mechanism.  Returns zero on success, negative values on failure.
  *
  */
-int netlbl_mgmt_genl_init(void)
+int __init netlbl_mgmt_genl_init(void)
 {
 	int ret_val, i;
 
diff --git a/trunk/net/netlabel/netlabel_unlabeled.c b/trunk/net/netlabel/netlabel_unlabeled.c
index f0f1322911de..4478f2f6079d 100644
--- a/trunk/net/netlabel/netlabel_unlabeled.c
+++ b/trunk/net/netlabel/netlabel_unlabeled.c
@@ -1624,7 +1624,7 @@ static struct genl_ops netlbl_unlabel_genl_ops[] = {
  * mechanism.  Returns zero on success, negative values on failure.
  *
  */
-int netlbl_unlabel_genl_init(void)
+int __init netlbl_unlabel_genl_init(void)
 {
 	int ret_val, i;
 
@@ -1661,7 +1661,7 @@ static struct notifier_block netlbl_unlhsh_netdev_notifier = {
  * non-zero values on error.
  *
  */
-int netlbl_unlabel_init(u32 size)
+int __init netlbl_unlabel_init(u32 size)
 {
 	u32 iter;
 	struct netlbl_unlhsh_tbl *hsh_tbl;
@@ -1765,7 +1765,7 @@ int netlbl_unlabel_getattr(const struct sk_buff *skb,
  * and to send unlabeled network traffic by default.
  *
  */
-int netlbl_unlabel_defconf(void)
+int __init netlbl_unlabel_defconf(void)
 {
 	int ret_val;
 	struct netlbl_dom_map *entry;
diff --git a/trunk/net/netlabel/netlabel_user.c b/trunk/net/netlabel/netlabel_user.c
index 023fc8fe840d..b17d4203806e 100644
--- a/trunk/net/netlabel/netlabel_user.c
+++ b/trunk/net/netlabel/netlabel_user.c
@@ -59,7 +59,7 @@
  * non-zero on failure.
  *
  */
-int netlbl_netlink_init(void)
+int __init netlbl_netlink_init(void)
 {
 	int ret_val;