kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2008-11-12 12:00:15 -08:00
commit 45a9524a61
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/linux/hrtimer.h
View file

@ -46,9 +46,6 @@ enum hrtimer_restart {
* hrtimer callback modes: * hrtimer callback modes:
* *
* HRTIMER_CB_SOFTIRQ: Callback must run in softirq context * 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 * HRTIMER_CB_IRQSAFE_PERCPU: Callback must run in hardirq context
* Special mode for tick emulation and * Special mode for tick emulation and
* scheduler timer. Such timers are per * scheduler timer. Such timers are per
@ -61,8 +58,6 @@ enum hrtimer_restart {
*/ */
enum hrtimer_cb_mode { enum hrtimer_cb_mode {
HRTIMER_CB_SOFTIRQ, HRTIMER_CB_SOFTIRQ,
HRTIMER_CB_IRQSAFE,
HRTIMER_CB_IRQSAFE_NO_RESTART,
HRTIMER_CB_IRQSAFE_PERCPU, HRTIMER_CB_IRQSAFE_PERCPU,
HRTIMER_CB_IRQSAFE_UNLOCKED, HRTIMER_CB_IRQSAFE_UNLOCKED,
}; };

9
kernel/hrtimer.c
View file

@ -664,14 +664,6 @@ static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer,
/* Timer is expired, act upon the callback mode */ /* Timer is expired, act upon the callback mode */
switch(timer->cb_mode) { switch(timer->cb_mode) {
case HRTIMER_CB_IRQSAFE_NO_RESTART:
debug_hrtimer_deactivate(timer);
/*
* We can call the callback from here. No restart
* happens, so no danger of recursion
*/
BUG_ON(timer->function(timer) != HRTIMER_NORESTART);
return 1;
case HRTIMER_CB_IRQSAFE_PERCPU: case HRTIMER_CB_IRQSAFE_PERCPU:
case HRTIMER_CB_IRQSAFE_UNLOCKED: case HRTIMER_CB_IRQSAFE_UNLOCKED:
/* /*
@ -683,7 +675,6 @@ static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer,
*/ */
debug_hrtimer_deactivate(timer); debug_hrtimer_deactivate(timer);
return 1; return 1;
case HRTIMER_CB_IRQSAFE:
case HRTIMER_CB_SOFTIRQ: case HRTIMER_CB_SOFTIRQ:
/* /*
* Move everything else into the softirq pending list ! * Move everything else into the softirq pending list !