diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-10 04:10:31 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-10 04:10:35 +0100 |
| commit | 7e1a2766e67a529f62c8cfba0a47d63fc4f7fa8a (patch) | |
| tree | 197950369a773afdf04af9bdfc4a2ce1d2b5d3af /kernel/user.c | |
| parent | c5e0cb3ddc5f14cedcfc50c0fb3b5fc6b56576da (diff) | |
| parent | 83f5b01ffbbaea6f97c9a79d21e240dbfb69f2f1 (diff) | |
Merge branch 'core/urgent' into core/rcu
Merge reason: Pick up RCU fixlet to base further commits on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/user.c')
| -rw-r--r-- | kernel/user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/user.c b/kernel/user.c index 2c000e7132ac..46d0165ca70c 100644 --- a/kernel/user.c +++ b/kernel/user.c @@ -330,9 +330,9 @@ done: */ static void free_user(struct user_struct *up, unsigned long flags) { - spin_unlock_irqrestore(&uidhash_lock, flags); INIT_DELAYED_WORK(&up->work, cleanup_user_struct); schedule_delayed_work(&up->work, msecs_to_jiffies(1000)); + spin_unlock_irqrestore(&uidhash_lock, flags); } #else /* CONFIG_USER_SCHED && CONFIG_SYSFS */ |