From f797c2f5499f5f8ba599e39cc0bdb8aff48e5e2d Mon Sep 17 00:00:00 2001
From: James Morris <jmorris@namei.org>
Date: Tue, 30 Aug 2011 14:11:24 +1000
Subject: [PATCH] --- yaml --- r: 285023 b: refs/heads/master c:
 b46610caba4bd9263afd07c7ef7a79974550554a h: refs/heads/master i:   285021:
 c2f92bed075d93f91ae472e59d3e5a783d4e6d5c   285019:
 2ccd755846df6c385d1270a65ba84512d1195a76   285015:
 77cd32e0789ad9d13e7e569fe5dc9c8d91912b21   285007:
 9f54e10f4f31f5406dbfc723f68a0e4796be99ad   284991:
 9ba1a5e4a55a5479bada3dca2b11099ba9d6e585 v: v3

---
 [refs]                         | 2 +-
 trunk/security/selinux/hooks.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 51c973ee3f23..2d7fecfec111 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94d4ef0c2b3e6c799f78d223e233254a870c4559
+refs/heads/master: b46610caba4bd9263afd07c7ef7a79974550554a
diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c
index 266a2292451d..e07cf7fcdce2 100644
--- a/trunk/security/selinux/hooks.c
+++ b/trunk/security/selinux/hooks.c
@@ -96,7 +96,7 @@ extern int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm);
 extern struct security_operations *security_ops;
 
 /* SECMARK reference count */
-atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
+static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
 
 #ifdef CONFIG_SECURITY_SELINUX_DEVELOP
 int selinux_enforcing;