diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 17:10:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 17:10:53 -0800 |
| commit | 3610639d1fceb09cb418c65fcbe9136c31eee03a (patch) | |
| tree | 78aa6de9e9495c39f8671aed927fece5adff8d24 /include | |
| parent | cfa97f993c275d193fe82c22511dfb5f1e51b661 (diff) | |
| parent | 82c5b7b527ccc4b5d3cf832437e842f9d2920a79 (diff) | |
| download | op-kernel-dev-3610639d1fceb09cb418c65fcbe9136c31eee03a.zip op-kernel-dev-3610639d1fceb09cb418c65fcbe9136c31eee03a.tar.gz | |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
hrtimer: splitout peek ahead functionality, fix
hrtimer: fixup comments
hrtimer: fix recursion deadlock by re-introducing the softirq
hrtimer: simplify hotplug migration
hrtimer: fix HOTPLUG_CPU=n compile warning
hrtimer: splitout peek ahead functionality
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/interrupt.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index af886b2..9127f6b 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -252,7 +252,8 @@ enum BLOCK_SOFTIRQ, TASKLET_SOFTIRQ, SCHED_SOFTIRQ, - RCU_SOFTIRQ, /* Preferable RCU should always be the last softirq */ + HRTIMER_SOFTIRQ, + RCU_SOFTIRQ, /* Preferable RCU should always be the last softirq */ NR_SOFTIRQS }; |
