Merge branch '4.0.8-rt6'

[zynq/linux.git] / kernel / user.c

diff --git a/kernel/user.c b/kernel/user.c
index b069ccbfb0b0375b5ab03445472f2679d6981bbf..1a2e88e98b5e61aca2c4d24d220f604e96a17595 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -161,11 +161,11 @@ void free_uid(struct user_struct *up)
        if (!up)
                return;
 
-       local_irq_save(flags);
+       local_irq_save_nort(flags);
        if (atomic_dec_and_lock(&up->__count, &uidhash_lock))
                free_user(up, flags);
        else
-               local_irq_restore(flags);
+               local_irq_restore_nort(flags);
 }
 
 struct user_struct *alloc_uid(kuid_t uid)