diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-12 12:00:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-12 12:00:15 -0800 |
| commit | 45a9524a61267a60aef3c273b97284e93b15f4d7 (patch) | |
| tree | 80e7ceee6758bd7ea76cf5505aa2f41d3376b0ba /include/linux | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx (diff) | |
| parent | hrtimer: clean up unused callback modes (diff) | |
| download | linux-dev-45a9524a61267a60aef3c273b97284e93b15f4d7.tar.xz linux-dev-45a9524a61267a60aef3c273b97284e93b15f4d7.zip | |
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: clean up unused callback modes
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/hrtimer.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 07e510a3b00a..3eba43878dcb 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -46,9 +46,6 @@ enum hrtimer_restart { * hrtimer callback modes: * * HRTIMER_CB_SOFTIRQ: Callback must run in softirq context - * HRTIMER_CB_IRQSAFE: Callback may run in hardirq context - * HRTIMER_CB_IRQSAFE_NO_RESTART: Callback may run in hardirq context and - * does not restart the timer * HRTIMER_CB_IRQSAFE_PERCPU: Callback must run in hardirq context * Special mode for tick emulation and * scheduler timer. Such timers are per @@ -61,8 +58,6 @@ enum hrtimer_restart { */ enum hrtimer_cb_mode { HRTIMER_CB_SOFTIRQ, - HRTIMER_CB_IRQSAFE, - HRTIMER_CB_IRQSAFE_NO_RESTART, HRTIMER_CB_IRQSAFE_PERCPU, HRTIMER_CB_IRQSAFE_UNLOCKED, }; |