The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: c7f3d43b629b598a2bb9ec3524e844eae7492e7e Gitweb: https://git.kernel.org/tip/c7f3d43b629b598a2bb9ec3524e844eae7492e7e Author: Thomas Gleixner tglx@linutronix.de AuthorDate: Sat, 06 Jun 2020 23:51:15 +02:00 Committer: Thomas Gleixner tglx@linutronix.de CommitterDate: Tue, 09 Jun 2020 16:36:47 +02:00
clocksource: Remove obsolete ifdef
CONFIG_GENERIC_VDSO_CLOCK_MODE was a transitional config switch which got removed after all architectures got converted to the new storage model.
But the removal forgot to remove the #ifdef which guards the vdso_clock_mode sanity check, which effectively disables the sanity check.
Remove it now.
Fixes: f86fd32db706 ("lib/vdso: Cleanup clock mode storage leftovers") Signed-off-by: Thomas Gleixner tglx@linutronix.de Tested-by: Miklos Szeredi mszeredi@redhat.com Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20200606221531.845475036@linutronix.de
--- kernel/time/clocksource.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 7cb09c4..02441ea 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -928,14 +928,12 @@ int __clocksource_register_scale(struct clocksource *cs, u32 scale, u32 freq)
clocksource_arch_init(cs);
-#ifdef CONFIG_GENERIC_VDSO_CLOCK_MODE if (cs->vdso_clock_mode < 0 || cs->vdso_clock_mode >= VDSO_CLOCKMODE_MAX) { pr_warn("clocksource %s registered with invalid VDSO mode %d. Disabling VDSO support.\n", cs->name, cs->vdso_clock_mode); cs->vdso_clock_mode = VDSO_CLOCKMODE_NONE; } -#endif
/* Initialize mult/shift and max_idle_ns */ __clocksource_update_freq_scale(cs, scale, freq);