From 246a1b6b145c06de8a4a085273c0e62582540740 Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jpirko@redhat.com>
Date: Sun, 25 Apr 2010 00:49:56 -0700
Subject: [PATCH] --- yaml --- r: 194529 b: refs/heads/master c:
 b3c981d2bbbe889125169bd0bb482e64d3c028a1 h: refs/heads/master i:   194527:
 707fe74a628a8dad43ed281c5bdc40a0d12558c1 v: v3

---
 [refs]                         | 2 +-
 trunk/net/core/net_namespace.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 530342f4152f..b3863b88cd49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c52d509e84bbf26cffb8b6e75b399689af67885
+refs/heads/master: b3c981d2bbbe889125169bd0bb482e64d3c028a1
diff --git a/trunk/net/core/net_namespace.c b/trunk/net/core/net_namespace.c
index bd8c4712ea24..69a20bfc527c 100644
--- a/trunk/net/core/net_namespace.c
+++ b/trunk/net/core/net_namespace.c
@@ -469,10 +469,10 @@ EXPORT_SYMBOL_GPL(register_pernet_subsys);
  *	addition run the exit method for all existing network
  *	namespaces.
  */
-void unregister_pernet_subsys(struct pernet_operations *module)
+void unregister_pernet_subsys(struct pernet_operations *ops)
 {
 	mutex_lock(&net_mutex);
-	unregister_pernet_operations(module);
+	unregister_pernet_operations(ops);
 	mutex_unlock(&net_mutex);
 }
 EXPORT_SYMBOL_GPL(unregister_pernet_subsys);