path: root/net/netfilter/xt_connlimit.c
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2013-03-05 18:10:04 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-05 18:10:04 -0800
commite3b59518c10e08eeb06215abf06f50e8f83b51dc (patch)
treea1e5933192ee123883112d771e27e9c972ccd733 /net/netfilter/xt_connlimit.c
parent6516ab6fdffbda656253d4e1231660c3f87f7889 (diff)
parent4cd5d1115c2f752ca94a0eb461b36d88fb37ed1e (diff)
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes and cleanups from Thomas Gleixner: "Commit e5ab012c3271 ("nohz: Make tick_nohz_irq_exit() irq safe") is the first commit in the series and the minimal necessary bugfix, which needs to go back into stable. The remanining commits enforce irq disabling in irq_exit(), sanitize the hardirq/softirq preempt count transition and remove a bunch of no longer necessary conditionals." I personally love getting rid of the very subtle and confusing IRQ_EXIT_OFFSET thing. Even apart from the whole "more lines removed than added" thing. * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irq: Don't re-enable interrupts at the end of irq_exit irq: Remove IRQ_EXIT_OFFSET workaround Revert "nohz: Make tick_nohz_irq_exit() irq safe" irq: Sanitize invoke_softirq irq: Ensure irq_exit() code runs with interrupts disabled nohz: Make tick_nohz_irq_exit() irq safe
Diffstat (limited to 'net/netfilter/xt_connlimit.c')
0 files changed, 0 insertions, 0 deletions