From a3314a5e38cdf07ae2b48efcd83e55f80d7123d4 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Fri, 6 Jan 2006 00:11:25 -0800
Subject: [PATCH] --- yaml --- r: 16343 b: refs/heads/master c:
 1ae8f40767a3afc6244719a2c8fbcf546767d5b0 h: refs/heads/master i:   16341:
 565ed775ff8e5b3295b874822ce9f41c04ebbf00   16339:
 4ae280cb0795d8d91ae8f443776eba940b38489f   16335:
 969de83a6a2e22ff58d18ebba7c7659dee2b01f6 v: v3

---
 [refs]                         | 2 +-
 trunk/security/keys/internal.h | 1 -
 trunk/security/keys/key.c      | 2 +-
 trunk/security/keys/keyring.c  | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c5b4f016d3f5..28d83ae6bf0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d9067bda99c68e1a17d93e78cf3a5a3f67e0c35
+refs/heads/master: 1ae8f40767a3afc6244719a2c8fbcf546767d5b0
diff --git a/trunk/security/keys/internal.h b/trunk/security/keys/internal.h
index db99ed434f3a..39cba97c5eb9 100644
--- a/trunk/security/keys/internal.h
+++ b/trunk/security/keys/internal.h
@@ -25,7 +25,6 @@
 #define kdebug(FMT, a...)	do {} while(0)
 #endif
 
-extern struct key_type key_type_dead;
 extern struct key_type key_type_user;
 
 /*****************************************************************************/
diff --git a/trunk/security/keys/key.c b/trunk/security/keys/key.c
index bb036623d0a8..99781b798312 100644
--- a/trunk/security/keys/key.c
+++ b/trunk/security/keys/key.c
@@ -36,7 +36,7 @@ static DECLARE_WORK(key_cleanup_task, key_cleanup, NULL);
 DECLARE_RWSEM(key_construction_sem);
 
 /* any key who's type gets unegistered will be re-typed to this */
-struct key_type key_type_dead = {
+static struct key_type key_type_dead = {
 	.name		= "dead",
 };
 
diff --git a/trunk/security/keys/keyring.c b/trunk/security/keys/keyring.c
index 0acecbd4fa37..5d22c0388b32 100644
--- a/trunk/security/keys/keyring.c
+++ b/trunk/security/keys/keyring.c
@@ -68,7 +68,7 @@ struct key_type key_type_keyring = {
  * semaphore to serialise link/link calls to prevent two link calls in parallel
  * introducing a cycle
  */
-DECLARE_RWSEM(keyring_serialise_link_sem);
+static DECLARE_RWSEM(keyring_serialise_link_sem);
 
 /*****************************************************************************/
 /*