diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2024-04-16 09:49:22 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2024-04-21 12:30:00 +0000 |
| commit | 70b6ab09a34b4cbcada982b2f5c68a408a5c0cde (patch) | |
| tree | 00a2205f46b5bc02020a2ef7cf13cf4adb1d4688 | |
| parent | 104f774967e1b3bb58ed5124a0e5b76597125e15 (diff) | |
| download | hikey-linaro-70b6ab09a34b4cbcada982b2f5c68a408a5c0cde.tar.gz | |
Revert "hrtimer: Report offline hrtimer enqueue"
This reverts commit b1f576be92d06228d4626b8c411e18dc408b8f6f 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: I3946038162ecfa5fafc8721ac4aaa8545ed540e2
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| -rw-r--r-- | include/linux/hrtimer.h | 4 | ||||
| -rw-r--r-- | kernel/time/hrtimer.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index ba8028bf7c33..9874d37cd8e4 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -200,7 +200,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 @@ -223,8 +222,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; diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index a756caed633f..80996a342bee 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -980,7 +980,6 @@ static int enqueue_hrtimer(struct hrtimer *timer, enum hrtimer_mode mode) { debug_activate(timer, mode); - WARN_ON_ONCE(!base->cpu_base->online); base->cpu_base->active_bases |= 1 << base->index; @@ -2079,7 +2078,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; } |