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

Commit d7cfb60c authored Sep 19, 2008 by Mark McLoughlin Committed by Ingo Molnar Sep 22, 2008

hrtimer: remove hrtimer_clock_base::get_softirq_time()



Peter Zijlstra noticed this 8 months ago and I just noticed
it again.

hrtimer_clock_base::get_softirq_time() is currently unused
in the entire tree. In fact, looking at the logs, it appears
as if it was never used. Remove it.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent d82f0b0f

include/linux/hrtimer.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -145,7 +145,6 @@ struct hrtimer_sleeper {
	* @first: pointer to the timer node which expires first		* @first: pointer to the timer node which expires first
	* @resolution: the resolution of the clock, in nanoseconds		* @resolution: the resolution of the clock, in nanoseconds
	* @get_time: function to retrieve the current time of the clock		* @get_time: function to retrieve the current time of the clock
	* @get_softirq_time: function to retrieve the current time from the softirq
	* @softirq_time: the time when running the hrtimer queue in the softirq		* @softirq_time: the time when running the hrtimer queue in the softirq
	* @offset: offset of this clock to the monotonic base		* @offset: offset of this clock to the monotonic base
	* @reprogram: function to reprogram the timer event		* @reprogram: function to reprogram the timer event
	@@ -157,7 +156,6 @@ struct hrtimer_clock_base {
	struct rb_node *first;		struct rb_node *first;
	ktime_t resolution;		ktime_t resolution;
	ktime_t (*get_time)(void);		ktime_t (*get_time)(void);
	ktime_t (*get_softirq_time)(void);
	ktime_t softirq_time;		ktime_t softirq_time;
	#ifdef CONFIG_HIGH_RES_TIMERS		#ifdef CONFIG_HIGH_RES_TIMERS
	ktime_t offset;		ktime_t offset;

kernel/hrtimer.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1401,9 +1401,7 @@ void hrtimer_run_queues(void)
	if (!base->first)		if (!base->first)
	continue;		continue;

	if (base->get_softirq_time)		if (gettime) {
	base->softirq_time = base->get_softirq_time();
	else if (gettime) {
	hrtimer_get_softirq_time(cpu_base);		hrtimer_get_softirq_time(cpu_base);
	gettime = 0;		gettime = 0;
	}		}