| From 98b4e8f388ccf23d0a9370c36b626ba2fcf370fc Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 3 Aug 2021 16:16:17 +0200 |
| Subject: clocksource: Replace deprecated CPU-hotplug functions. |
| |
| From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> |
| |
| [ Upstream commit 698429f9d0e54ce3964151adff886ee5fc59714b ] |
| |
| The functions get_online_cpus() and put_online_cpus() have been |
| deprecated during the CPU hotplug rework. They map directly to |
| cpus_read_lock() and cpus_read_unlock(). |
| |
| Replace deprecated CPU-hotplug functions with the official version. |
| The behavior remains unchanged. |
| |
| Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Link: https://lore.kernel.org/r/20210803141621.780504-35-bigeasy@linutronix.de |
| Stable-dep-of: 6bb05a33337b ("clocksource: Use migrate_disable() to avoid calling get_random_u32() in atomic context") |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| kernel/time/clocksource.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c |
| index 00cf99cb74496..e44fb1e12a281 100644 |
| --- a/kernel/time/clocksource.c |
| +++ b/kernel/time/clocksource.c |
| @@ -335,12 +335,12 @@ static void clocksource_verify_percpu(struct clocksource *cs) |
| return; |
| cpumask_clear(&cpus_ahead); |
| cpumask_clear(&cpus_behind); |
| - get_online_cpus(); |
| + cpus_read_lock(); |
| preempt_disable(); |
| clocksource_verify_choose_cpus(); |
| if (cpumask_weight(&cpus_chosen) == 0) { |
| preempt_enable(); |
| - put_online_cpus(); |
| + cpus_read_unlock(); |
| pr_warn("Not enough CPUs to check clocksource '%s'.\n", cs->name); |
| return; |
| } |
| @@ -366,7 +366,7 @@ static void clocksource_verify_percpu(struct clocksource *cs) |
| cs_nsec_min = cs_nsec; |
| } |
| preempt_enable(); |
| - put_online_cpus(); |
| + cpus_read_unlock(); |
| if (!cpumask_empty(&cpus_ahead)) |
| pr_warn(" CPUs %*pbl ahead of CPU %d for clocksource %s.\n", |
| cpumask_pr_args(&cpus_ahead), testcpu, cs->name); |
| -- |
| 2.39.5 |
| |
