diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-06 13:37:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-06 13:37:30 -0700 |
| commit | 609862be074cc20e007c640fd936ffe798b41abc (patch) | |
| tree | 2ebcacf036fce1b075fe267f608b6abe3f196c67 /include | |
| parent | 12fe32e4f942ac5c71a4ab70b039fee65c0dc29d (diff) | |
| parent | eedeeabdeeadb016b8c783e3620d06b98d0cb4e1 (diff) | |
| download | linux-609862be074cc20e007c640fd936ffe798b41abc.tar.gz linux-609862be074cc20e007c640fd936ffe798b41abc.tar.bz2 linux-609862be074cc20e007c640fd936ffe798b41abc.zip | |
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')
| -rw-r--r-- | include/linux/hrtimer.h | 5 | ||||
| -rw-r--r-- | include/linux/interrupt.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index bd37078c2d7d..0d2f7c8a33d6 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -336,6 +336,11 @@ extern int hrtimer_start(struct hrtimer *timer, ktime_t tim, const enum hrtimer_mode mode); extern int hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, unsigned long range_ns, const enum hrtimer_mode mode); +extern int +__hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, + unsigned long delta_ns, + const enum hrtimer_mode mode, int wakeup); + extern int hrtimer_cancel(struct hrtimer *timer); extern int hrtimer_try_to_cancel(struct hrtimer *timer); 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); #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) extern void raise_softirq_irqoff(unsigned int nr); extern void raise_softirq(unsigned int nr); +extern void wakeup_softirqd(void); /* This is the worklist that queues up per-cpu softirq work. * |