aboutsummaryrefslogtreecommitdiff
path: root/net/unix/sysctl_net_unix.c
diff options
context:
space:
mode:
authorPeter Zijlstra <[email protected]>2008-02-13 21:33:16 +0100
committerLinus Torvalds <[email protected]>2008-02-13 13:29:25 -0800
commitaa02cd2d9bd1e24a230bd66a0a741b984d03915a (patch)
tree06e341e095749048feabbe2ded236e5db38ee251 /net/unix/sysctl_net_unix.c
parent10270d4838bdc493781f5a1cf2e90e9c34c9142f (diff)
xtime_lock vs update_process_times
Commit d3d74453c34f8fd87674a8cf5b8a327c68f22e99 ("hrtimer: fixup the HRTIMER_CB_IRQSAFE_NO_SOFTIRQ fallback") broke several archs, and since only Russell bothered to merge the fix, and Greg to ACK his arch, I'm sending this for merger. I have confirmation that the Alpha bit results in a booting kernel. That leaves: blackfin, frv, sh and sparc untested. The deadlock in question was found by Russell: IRQ handle -> timer_tick() - xtime seqlock held for write -> update_process_times() -> run_local_timers() -> hrtimer_run_queues() -> hrtimer_get_softirq_time() - tries to get a read lock Now, Thomas assures me the fix is trivial, only do_timer() needs to be done under the xtime_lock, and update_process_times() can savely be removed from under it. Signed-off-by: Peter Zijlstra <[email protected]> Acked-by: Greg Ungerer <[email protected]> CC: Richard Henderson <[email protected]> CC: Bryan Wu <[email protected]> CC: David Howells <[email protected]> CC: Paul Mundt <[email protected]> CC: William Irwin <[email protected]> Acked-by: Ingo Molnar <[email protected]> Acked-by: Ivan Kokshaysky <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions