diff --git a/[refs] b/[refs] index c3aa19474e5b..efe14aa6b042 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 562f5e638de4ef451226552fe8dd7847bacea24e +refs/heads/master: 571428be550fbe37160596995e96ad398873fcbd diff --git a/trunk/kernel/user.c b/trunk/kernel/user.c index 7e72614b736d..2c7d8d5914b1 100644 --- a/trunk/kernel/user.c +++ b/trunk/kernel/user.c @@ -91,6 +91,7 @@ static struct user_struct *uid_hash_find(uid_t uid, struct hlist_head *hashent) * upon function exit. */ static void free_user(struct user_struct *up, unsigned long flags) + __releases(&uidhash_lock) { uid_hash_remove(up); spin_unlock_irqrestore(&uidhash_lock, flags);