Commit b7c8e1f8 authored by Jiapeng Chong's avatar Jiapeng Chong Committed by Thomas Gleixner
Browse files

hrtimer: Rename __hrtimer_hres_active() to hrtimer_hres_active() 



The function hrtimer_hres_active() are defined in the hrtimer.c file, but
not called elsewhere, so rename __hrtimer_hres_active() to
hrtimer_hres_active() and remove the old hrtimer_hres_active() function.

kernel/time/hrtimer.c:653:19: warning: unused function 'hrtimer_hres_active'.

Fixes: 82ccdf06 ("hrtimer: Remove unused function")
Reported-by: default avatarAbaci Robot <abaci@linux.alibaba.com>
Signed-off-by: default avatarJiapeng Chong <jiapeng.chong@linux.alibaba.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarAnna-Maria Behnsen <anna-maria@linutronix.de>
Link: https://lore.kernel.org/r/20240418023000.130324-1-jiapeng.chong@linux.alibaba.com
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=8778
parent e84c6003

kernel/time/hrtimer.c

+8 −13
Original line number Diff line number Diff line
@@ -644,17 +644,12 @@ static inline ktime_t hrtimer_update_base(struct hrtimer_cpu_base *base) 
/*

 * Is the high resolution mode active ?

 */

static inline int __hrtimer_hres_active(struct hrtimer_cpu_base *cpu_base)

static inline int hrtimer_hres_active(struct hrtimer_cpu_base *cpu_base)

{

	return IS_ENABLED(CONFIG_HIGH_RES_TIMERS) ?

		cpu_base->hres_active : 0;

}



static inline int hrtimer_hres_active(void)

{

	return __hrtimer_hres_active(this_cpu_ptr(&hrtimer_bases));

}



static void __hrtimer_reprogram(struct hrtimer_cpu_base *cpu_base,

				struct hrtimer *next_timer,

				ktime_t expires_next)
@@ -678,7 +673,7 @@ static void __hrtimer_reprogram(struct hrtimer_cpu_base *cpu_base, 
	 * set. So we'd effectively block all timers until the T2 event

	 * fires.

	 */

	if (!__hrtimer_hres_active(cpu_base) || cpu_base->hang_detected)

	if (!hrtimer_hres_active(cpu_base) || cpu_base->hang_detected)

		return;



	tick_program_event(expires_next, 1);
@@ -789,12 +784,12 @@ static void retrigger_next_event(void *arg) 
	 * function call will take care of the reprogramming in case the

	 * CPU was in a NOHZ idle sleep.

	 */

	if (!__hrtimer_hres_active(base) && !tick_nohz_active)

	if (!hrtimer_hres_active(base) && !tick_nohz_active)

		return;



	raw_spin_lock(&base->lock);

	hrtimer_update_base(base);

	if (__hrtimer_hres_active(base))

	if (hrtimer_hres_active(base))

		hrtimer_force_reprogram(base, 0);

	else

		hrtimer_update_next_event(base);
@@ -951,7 +946,7 @@ void clock_was_set(unsigned int bases) 
	cpumask_var_t mask;

	int cpu;



	if (!__hrtimer_hres_active(cpu_base) && !tick_nohz_active)

	if (!hrtimer_hres_active(cpu_base) && !tick_nohz_active)

		goto out_timerfd;



	if (!zalloc_cpumask_var(&mask, GFP_KERNEL)) {
@@ -1491,7 +1486,7 @@ u64 hrtimer_get_next_event(void) 


	raw_spin_lock_irqsave(&cpu_base->lock, flags);



	if (!__hrtimer_hres_active(cpu_base))

	if (!hrtimer_hres_active(cpu_base))

		expires = __hrtimer_get_next_event(cpu_base, HRTIMER_ACTIVE_ALL);



	raw_spin_unlock_irqrestore(&cpu_base->lock, flags);
@@ -1514,7 +1509,7 @@ u64 hrtimer_next_event_without(const struct hrtimer *exclude) 


	raw_spin_lock_irqsave(&cpu_base->lock, flags);



	if (__hrtimer_hres_active(cpu_base)) {

	if (hrtimer_hres_active(cpu_base)) {

		unsigned int active;



		if (!cpu_base->softirq_activated) {
@@ -1886,7 +1881,7 @@ void hrtimer_run_queues(void) 
	unsigned long flags;

	ktime_t now;



	if (__hrtimer_hres_active(cpu_base))

	if (hrtimer_hres_active(cpu_base))

		return;



	/*