Commit 621a0d52 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

hrtimer: clean up unused callback modes 



Impact: cleanup

git grep HRTIMER_CB_IRQSAFE revealed half the callback modes are actually
unused.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f21f237c

include/linux/hrtimer.h

+0 −5
Original line number Diff line number Diff line
@@ -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,

};

kernel/hrtimer.c

+0 −9
Original line number Diff line number Diff line
@@ -664,14 +664,6 @@ static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer, 


		/* Timer is expired, act upon the callback 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_UNLOCKED:

			/*
@@ -683,7 +675,6 @@ static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer, 
			 */

			debug_hrtimer_deactivate(timer);

			return 1;

		case HRTIMER_CB_IRQSAFE:

		case HRTIMER_CB_SOFTIRQ:

			/*

			 * Move everything else into the softirq pending list !