Commit ebba2c72 authored by Anna-Maria Gleixner's avatar Anna-Maria Gleixner Committed by Ingo Molnar
Browse files

hrtimer: Make hrtimer_force_reprogramm() unconditionally available 



hrtimer_force_reprogram() needs to be available unconditionally for softirq
based hrtimers. Move the function and all required struct members out of
the CONFIG_HIGH_RES_TIMERS #ifdef.

There is no functional change because hrtimer_force_reprogram() is only
invoked when hrtimer_cpu_base.hres_active is true and
CONFIG_HIGH_RES_TIMERS=y.

Making it unconditional increases the text size for the
CONFIG_HIGH_RES_TIMERS=n case slightly, but avoids replication of that code
for the upcoming softirq based hrtimers support. Most of the code gets
eliminated in the CONFIG_HIGH_RES_TIMERS=n case by the compiler.

Signed-off-by: default avatarAnna-Maria Gleixner <anna-maria@linutronix.de>
Cc: Christoph Hellwig <hch@lst.de>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: keescook@chromium.org
Link: http://lkml.kernel.org/r/20171221104205.7269-19-anna-maria@linutronix.de


[ Made it build on !CONFIG_HIGH_RES_TIMERS ]
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 11a9fe06

kernel/time/hrtimer.c

+28 −32
Original line number Diff line number Diff line
@@ -458,7 +458,6 @@ __next_base(struct hrtimer_cpu_base *cpu_base, unsigned int *active) 
#define for_each_active_base(base, cpu_base, active)	\

	while ((base = __next_base((cpu_base), &(active))))



#if defined(CONFIG_NO_HZ_COMMON) || defined(CONFIG_HIGH_RES_TIMERS)

static ktime_t __hrtimer_get_next_event(struct hrtimer_cpu_base *cpu_base)

{

	struct hrtimer_clock_base *base;
@@ -487,7 +486,6 @@ static ktime_t __hrtimer_get_next_event(struct hrtimer_cpu_base *cpu_base) 
		expires_next = 0;

	return expires_next;

}

#endif



static inline ktime_t hrtimer_update_base(struct hrtimer_cpu_base *base)

{
@@ -513,34 +511,6 @@ static inline int hrtimer_hres_active(void) 
	return __hrtimer_hres_active(this_cpu_ptr(&hrtimer_bases));

}



/* High resolution timer related functions */

#ifdef CONFIG_HIGH_RES_TIMERS



/*

 * High resolution timer enabled ?

 */

static bool hrtimer_hres_enabled __read_mostly  = true;

unsigned int hrtimer_resolution __read_mostly = LOW_RES_NSEC;

EXPORT_SYMBOL_GPL(hrtimer_resolution);



/*

 * Enable / Disable high resolution mode

 */

static int __init setup_hrtimer_hres(char *str)

{

	return (kstrtobool(str, &hrtimer_hres_enabled) == 0);

}



__setup("highres=", setup_hrtimer_hres);



/*

 * hrtimer_high_res_enabled - query, if the highres mode is enabled

 */

static inline int hrtimer_is_hres_enabled(void)

{

	return hrtimer_hres_enabled;

}



/*

 * Reprogram the event source with checking both queues for the

 * next event
@@ -581,6 +551,34 @@ hrtimer_force_reprogram(struct hrtimer_cpu_base *cpu_base, int skip_equal) 
	tick_program_event(cpu_base->expires_next, 1);

}



/* High resolution timer related functions */

#ifdef CONFIG_HIGH_RES_TIMERS



/*

 * High resolution timer enabled ?

 */

static bool hrtimer_hres_enabled __read_mostly  = true;

unsigned int hrtimer_resolution __read_mostly = LOW_RES_NSEC;

EXPORT_SYMBOL_GPL(hrtimer_resolution);



/*

 * Enable / Disable high resolution mode

 */

static int __init setup_hrtimer_hres(char *str)

{

	return (kstrtobool(str, &hrtimer_hres_enabled) == 0);

}



__setup("highres=", setup_hrtimer_hres);



/*

 * hrtimer_high_res_enabled - query, if the highres mode is enabled

 */

static inline int hrtimer_is_hres_enabled(void)

{

	return hrtimer_hres_enabled;

}



/*

 * Retrigger next event is called after clock was set

 *
@@ -639,8 +637,6 @@ void clock_was_set_delayed(void) 


static inline int hrtimer_is_hres_enabled(void) { return 0; }

static inline void hrtimer_switch_to_hres(void) { }

static inline void

hrtimer_force_reprogram(struct hrtimer_cpu_base *base, int skip_equal) { }

static inline void retrigger_next_event(void *arg) { }



#endif /* CONFIG_HIGH_RES_TIMERS */

CRA Git | Maintained and supported by SUSTech CRA and CCSE