---

yaml --- r: 16343 b: refs/heads/master c: 1ae8f40 h: refs/heads/master i: 16341: 565ed77 16339: 4ae280c 16335: 969de83 v: v3
git-mirror · Jan 6, 2006 · a3314a5 · a3314a5
1 parent 31403b8
commit a3314a5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);
 
 /*****************************************************************************/
 /*