lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 298/376] clocksource: Remove obsolete ifdef
    Date
    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);

    \
     
     \ /
      Last update: 2020-06-19 17:39    [W:3.164 / U:0.868 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site