diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:19:12 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:37:18 (GMT) |
| commit | 86ba38e6f5f2fbfe9b49e153ea89593b26482019 (patch) | |
| tree | f99d2906b0eafca507f37289e68052fc105cc2dc /kernel/user.c | |
| parent | 07c8b57b111585a617b2b456497fc9b33c00743c (diff) | |
| download | linux-fsl-qoriq-86ba38e6f5f2fbfe9b49e153ea89593b26482019.tar.xz | |
Reset to 3.12.19
Diffstat (limited to 'kernel/user.c')
| -rw-r--r-- | kernel/user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/user.c b/kernel/user.c index 2800008..5bbb919 100644 --- a/kernel/user.c +++ b/kernel/user.c @@ -154,11 +154,11 @@ void free_uid(struct user_struct *up) if (!up) return; - local_irq_save_nort(flags); + local_irq_save(flags); if (atomic_dec_and_lock(&up->__count, &uidhash_lock)) free_user(up, flags); else - local_irq_restore_nort(flags); + local_irq_restore(flags); } struct user_struct *alloc_uid(kuid_t uid) |