diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
| commit | 21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch) | |
| tree | e1be8645297f8ebe87445251743ebcc52081a20d /security/keys/process_keys.c | |
| parent | 34161db6b14d984fb9b06c735b7b42f8803f6851 (diff) | |
| parent | 68380b581383c028830f79ec2670f4a193854aa6 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Diffstat (limited to 'security/keys/process_keys.c')
| -rw-r--r-- | security/keys/process_keys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index 32150cf7c37f..b6f86808475a 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c | |||
| @@ -27,7 +27,7 @@ static DEFINE_MUTEX(key_session_mutex); | |||
| 27 | struct key_user root_key_user = { | 27 | struct key_user root_key_user = { |
| 28 | .usage = ATOMIC_INIT(3), | 28 | .usage = ATOMIC_INIT(3), |
| 29 | .consq = LIST_HEAD_INIT(root_key_user.consq), | 29 | .consq = LIST_HEAD_INIT(root_key_user.consq), |
| 30 | .lock = SPIN_LOCK_UNLOCKED, | 30 | .lock = __SPIN_LOCK_UNLOCKED(root_key_user.lock), |
| 31 | .nkeys = ATOMIC_INIT(2), | 31 | .nkeys = ATOMIC_INIT(2), |
| 32 | .nikeys = ATOMIC_INIT(2), | 32 | .nikeys = ATOMIC_INIT(2), |
| 33 | .uid = 0, | 33 | .uid = 0, |