timer fixes for 2.6.33
Linus,
Please pull the latest timers-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers-fixes-for-linus
Thanks,
tglx
------------------>
Peter Zijlstra (1):
hrtimer, softirq: Fix hrtimer->softirq trampoline
kernel/softirq.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-)
kernel/softirq.c +5 -10
@@ -500,22 +500,17 @@ EXPORT_SYMBOL(tasklet_kill);*/ /* -* The trampoline is called when the hrtimer expires. If this is -* called from the hrtimer interrupt then we schedule the tasklet as -* the timer callback function expects to run in softirq context. If -* it's called in softirq context anyway (i.e. high resolution timers -* disabled) then the hrtimer callback is called right away. +* The trampoline is called when the hrtimer expires. It schedules a tasklet +* to run __tasklet_hrtimer_trampoline() which in turn will call the intended +* hrtimer callback, but from softirq context. */ static enum hrtimer_restart __hrtimer_tasklet_trampoline (struct hrtimer *timer) {struct tasklet_hrtimer *ttimer = container_of(timer, struct tasklet_hrtimer, timer); -if (hrtimer_is_hres_active (timer)) { -tasklet_hi_schedule (&ttimer->tasklet); -return HRTIMER_NORESTART ; - } -return ttimer->function (timer); +tasklet_hi_schedule (&ttimer->tasklet); +return HRTIMER_NORESTART ; }/*