diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-06 16:37:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-06 16:37:30 -0400 |
| commit | 609862be074cc20e007c640fd936ffe798b41abc (patch) | |
| tree | 2ebcacf036fce1b075fe267f608b6abe3f196c67 /include/linux/interrupt.h | |
| parent | 12fe32e4f942ac5c71a4ab70b039fee65c0dc29d (diff) | |
| parent | eedeeabdeeadb016b8c783e3620d06b98d0cb4e1 (diff) | |
Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
lockdep: add stack dumps to asserts
hrtimer: fix rq->lock inversion (again)
Diffstat (limited to 'include/linux/interrupt.h')
| -rw-r--r-- | include/linux/interrupt.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index ce2c07d99fc3..8a9613d0c674 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h | |||
| @@ -299,6 +299,7 @@ extern void softirq_init(void); | |||
| 299 | #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) | 299 | #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) |
| 300 | extern void raise_softirq_irqoff(unsigned int nr); | 300 | extern void raise_softirq_irqoff(unsigned int nr); |
| 301 | extern void raise_softirq(unsigned int nr); | 301 | extern void raise_softirq(unsigned int nr); |
| 302 | extern void wakeup_softirqd(void); | ||
| 302 | 303 | ||
| 303 | /* This is the worklist that queues up per-cpu softirq work. | 304 | /* This is the worklist that queues up per-cpu softirq work. |
| 304 | * | 305 | * |