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

Commit 241e0d86 authored Mar 05, 2024 by Greg Kroah-Hartman

Revert "hrtimer: Report offline hrtimer enqueue"



This reverts commit a012efe0 which is
commit dad6a09f3148257ac1773cd90934d721d68ab595 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I60b729d7bdef7b6fdfcd1b32dd5f8b10242283f8
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parent ce97b1b6

include/linux/hrtimer.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -199,7 +199,6 @@ enum hrtimer_base_type {
		* @max_hang_time: Maximum time spent in hrtimer_interrupt
		* @softirq_expiry_lock: Lock which is taken while softirq based hrtimer are
		* expired
		* @online: CPU is online from an hrtimers point of view
		* @timer_waiters: A hrtimer_cancel() invocation waits for the timer
		* callback to finish.
		* @expires_next: absolute time of the next event, is required for remote
		@@ -222,8 +221,7 @@ struct hrtimer_cpu_base {
		unsigned int hres_active : 1,
		in_hrtirq : 1,
		hang_detected : 1,
		softirq_activated : 1,
		online : 1;
		softirq_activated : 1;
		#ifdef CONFIG_HIGH_RES_TIMERS
		unsigned int nr_events;
		unsigned short nr_retries;

kernel/time/hrtimer.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -2069,7 +2069,6 @@ int hrtimers_prepare_cpu(unsigned int cpu)
		cpu_base->softirq_next_timer = NULL;
		cpu_base->expires_next = KTIME_MAX;
		cpu_base->softirq_expires_next = KTIME_MAX;
		cpu_base->online = 1;
		hrtimer_cpu_base_init_expiry_lock(cpu_base);
		return 0;
		}