diff options
-rw-r--r-- | security/keys/internal.h | 1 | ||||
-rw-r--r-- | security/keys/key.c | 2 | ||||
-rw-r--r-- | security/keys/keyring.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/security/keys/internal.h b/security/keys/internal.h index db99ed434f3a..39cba97c5eb9 100644 --- a/security/keys/internal.h +++ b/security/keys/internal.h | |||
@@ -25,7 +25,6 @@ | |||
25 | #define kdebug(FMT, a...) do {} while(0) | 25 | #define kdebug(FMT, a...) do {} while(0) |
26 | #endif | 26 | #endif |
27 | 27 | ||
28 | extern struct key_type key_type_dead; | ||
29 | extern struct key_type key_type_user; | 28 | extern struct key_type key_type_user; |
30 | 29 | ||
31 | /*****************************************************************************/ | 30 | /*****************************************************************************/ |
diff --git a/security/keys/key.c b/security/keys/key.c index bb036623d0a8..99781b798312 100644 --- a/security/keys/key.c +++ b/security/keys/key.c | |||
@@ -36,7 +36,7 @@ static DECLARE_WORK(key_cleanup_task, key_cleanup, NULL); | |||
36 | DECLARE_RWSEM(key_construction_sem); | 36 | DECLARE_RWSEM(key_construction_sem); |
37 | 37 | ||
38 | /* any key who's type gets unegistered will be re-typed to this */ | 38 | /* any key who's type gets unegistered will be re-typed to this */ |
39 | struct key_type key_type_dead = { | 39 | static struct key_type key_type_dead = { |
40 | .name = "dead", | 40 | .name = "dead", |
41 | }; | 41 | }; |
42 | 42 | ||
diff --git a/security/keys/keyring.c b/security/keys/keyring.c index 0acecbd4fa37..5d22c0388b32 100644 --- a/security/keys/keyring.c +++ b/security/keys/keyring.c | |||
@@ -68,7 +68,7 @@ struct key_type key_type_keyring = { | |||
68 | * semaphore to serialise link/link calls to prevent two link calls in parallel | 68 | * semaphore to serialise link/link calls to prevent two link calls in parallel |
69 | * introducing a cycle | 69 | * introducing a cycle |
70 | */ | 70 | */ |
71 | DECLARE_RWSEM(keyring_serialise_link_sem); | 71 | static DECLARE_RWSEM(keyring_serialise_link_sem); |
72 | 72 | ||
73 | /*****************************************************************************/ | 73 | /*****************************************************************************/ |
74 | /* | 74 | /* |