summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-01-06 00:11:25 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 08:33:30 -0800
commit1ae8f40767a3afc6244719a2c8fbcf546767d5b0 (patch)
treef41d957bbc60ad940132fd28ea13a8fced63a398
parent8d9067bda99c68e1a17d93e78cf3a5a3f67e0c35 (diff)
downloadop-kernel-dev-1ae8f40767a3afc6244719a2c8fbcf546767d5b0.zip
op-kernel-dev-1ae8f40767a3afc6244719a2c8fbcf546767d5b0.tar.gz
[PATCH] security/: possible cleanups
make needlessly global code static Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--security/keys/internal.h1
-rw-r--r--security/keys/key.c2
-rw-r--r--security/keys/keyring.c2
3 files changed, 2 insertions, 3 deletions
diff --git a/security/keys/internal.h b/security/keys/internal.h
index db99ed4..39cba97 100644
--- a/security/keys/internal.h
+++ b/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/security/keys/key.c b/security/keys/key.c
index bb03662..99781b7 100644
--- a/security/keys/key.c
+++ b/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/security/keys/keyring.c b/security/keys/keyring.c
index 0acecbd..5d22c03 100644
--- a/security/keys/keyring.c
+++ b/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);
/*****************************************************************************/
/*
OpenPOWER on IntegriCloud