diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
| commit | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (patch) | |
| tree | 547fd497a80818a60ac36831377d5df97868173c /security/keys/internal.h | |
| parent | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'security/keys/internal.h')
| -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 | ||