diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-13 23:52:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-13 23:52:39 -0400 |
| commit | 4ae127d1b6c71f9240dd4245f240e6dd8fc98014 (patch) | |
| tree | b7aa27b3e0c655f4613fe2146cb57d7f69e421f6 /security/keys | |
| parent | 875ec4333b99144e2589e900a0bcd2c25c757b27 (diff) | |
| parent | 7775c9753b94fe429dc4323360d6502c95e0dd6e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smc911x.c
Diffstat (limited to 'security/keys')
| -rw-r--r-- | security/keys/internal.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/keys/internal.h b/security/keys/internal.h index 8c05587f5018..b39f5c2e2c4b 100644 --- a/security/keys/internal.h +++ b/security/keys/internal.h | |||
| @@ -78,7 +78,6 @@ extern unsigned key_quota_maxbytes; | |||
| 78 | 78 | ||
| 79 | extern struct rb_root key_serial_tree; | 79 | extern struct rb_root key_serial_tree; |
| 80 | extern spinlock_t key_serial_lock; | 80 | extern spinlock_t key_serial_lock; |
| 81 | extern struct semaphore key_alloc_sem; | ||
| 82 | extern struct mutex key_construction_mutex; | 81 | extern struct mutex key_construction_mutex; |
| 83 | extern wait_queue_head_t request_key_conswq; | 82 | extern wait_queue_head_t request_key_conswq; |
| 84 | 83 | ||