Skip to contentSkip to conversation

Allow for HRTIMER_RESTART in a CB_IRQSAFE callback.

PATCH Applied Steven Rostedt 1 participant 1 message Apr 3, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Allow for HRTIMER_RESTART in a CB_IRQSAFE callback.

This patch simply requeues a CB if HRTIMER_RESTART is set in CB_IRQSAFE hrtimer_interrupt.

-- Steve

kernel/hrtimer.c +4 -2
Index: linux-2.6.16-rt12/kernel/hrtimer.c
===================================================================
@@ -838,8 +838,10 @@ int hrtimer_interrupt(void)
 			if (timer->mode == HRTIMER_CB_IRQSAFE) {
 				int ret = timer->function(timer);
 
-				BUG_ON(ret != HRTIMER_NORESTART);
-				timer->node.rb_parent = HRTIMER_INACTIVE;
+				if (ret == HRTIMER_RESTART)
+					enqueue_hrtimer(timer, base);
+				else
+					timer->node.rb_parent = HRTIMER_INACTIVE;
 			} else {
 				hrtimer_add_cb_pending(timer, base);
 				raise = 1;