Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d0bab9d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-fixes-for-linus' of... 

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, softirq: Fix hrtimer->softirq trampoline
parents 0aa2ca9a b9c30322

kernel/softirq.c

+5 −10
Original line number Diff line number Diff line
@@ -500,23 +500,18 @@ 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);

}



/*

 * Helper function which calls the hrtimer callback from