projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linux
[firefly-linux-kernel-4.4.55.git]
/
security
/
keys
/
process_keys.c
diff --git
a/security/keys/process_keys.c
b/security/keys/process_keys.c
index 32150cf7c37f8de1662758746e1123a6e8a100e6..b6f86808475a0aedfb28e9d677fda7db553f006b 100644
(file)
--- a/
security/keys/process_keys.c
+++ b/
security/keys/process_keys.c
@@
-27,7
+27,7
@@
static DEFINE_MUTEX(key_session_mutex);
struct key_user root_key_user = {
.usage = ATOMIC_INIT(3),
.consq = LIST_HEAD_INIT(root_key_user.consq),
- .lock =
SPIN_LOCK_UNLOCKED
,
+ .lock =
__SPIN_LOCK_UNLOCKED(root_key_user.lock)
,
.nkeys = ATOMIC_INIT(2),
.nikeys = ATOMIC_INIT(2),
.uid = 0,