| From c7f3d43b629b598a2bb9ec3524e844eae7492e7e Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sat, 6 Jun 2020 23:51:15 +0200 |
| Subject: clocksource: Remove obsolete ifdef |
| |
| From: Thomas Gleixner <tglx@linutronix.de> |
| |
| commit c7f3d43b629b598a2bb9ec3524e844eae7492e7e upstream. |
| |
| 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 |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| kernel/time/clocksource.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| --- a/kernel/time/clocksource.c |
| +++ b/kernel/time/clocksource.c |
| @@ -928,14 +928,12 @@ int __clocksource_register_scale(struct |
| |
| 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); |
