diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 11:30:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 11:30:15 -0800 |
| commit | 961767b75d63c21aa60ee3ccf940288c3c1afde6 (patch) | |
| tree | 2ba45f33bcd7998fd52a1f423e76265370953054 /kernel/user.c | |
| parent | 1fd18a871a0761633d02d0536ecb4a311d92a3d3 (diff) | |
| parent | d4515646699b6ad7b1a98ceb871296b957f3ef47 (diff) | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
highmem: Fix debug_kmap_atomic() to also handle KM_IRQ_PTE, KM_NMI, and KM_NMI_PTE
highmem: Fix race in debug_kmap_atomic() which could cause warn_count to underflow
rcu: Fix long-grace-period race between forcing and initialization
uids: Prevent tear down race
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 */ |