diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-05 18:10:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-05 18:10:04 -0800 |
| commit | e3b59518c10e08eeb06215abf06f50e8f83b51dc (patch) | |
| tree | a1e5933192ee123883112d771e27e9c972ccd733 /include/linux | |
| parent | 6516ab6fdffbda656253d4e1231660c3f87f7889 (diff) | |
| parent | 4cd5d1115c2f752ca94a0eb461b36d88fb37ed1e (diff) | |
| download | linux-3.10-e3b59518c10e08eeb06215abf06f50e8f83b51dc.tar.gz linux-3.10-e3b59518c10e08eeb06215abf06f50e8f83b51dc.tar.bz2 linux-3.10-e3b59518c10e08eeb06215abf06f50e8f83b51dc.zip | |
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 'include/linux')
| -rw-r--r-- | include/linux/hardirq.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h index 29eb805ea4a..c1d6555d256 100644 --- a/include/linux/hardirq.h +++ b/include/linux/hardirq.h @@ -118,10 +118,8 @@ #ifdef CONFIG_PREEMPT_COUNT # define preemptible() (preempt_count() == 0 && !irqs_disabled()) -# define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1) #else # define preemptible() 0 -# define IRQ_EXIT_OFFSET HARDIRQ_OFFSET #endif #if defined(CONFIG_SMP) || defined(CONFIG_GENERIC_HARDIRQS) |