Skip to content

Commit c7f3d43

Browse files
committed
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: f86fd32 ("lib/vdso: Cleanup clock mode storage leftovers") Signed-off-by: Thomas Gleixner <[email protected]> Tested-by: Miklos Szeredi <[email protected]> Cc: [email protected] Link: https://lkml.kernel.org/r/[email protected]
1 parent d8ad6d3 commit c7f3d43

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

kernel/time/clocksource.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -928,14 +928,12 @@ int __clocksource_register_scale(struct clocksource *cs, u32 scale, u32 freq)
928928

929929
clocksource_arch_init(cs);
930930

931-
#ifdef CONFIG_GENERIC_VDSO_CLOCK_MODE
932931
if (cs->vdso_clock_mode < 0 ||
933932
cs->vdso_clock_mode >= VDSO_CLOCKMODE_MAX) {
934933
pr_warn("clocksource %s registered with invalid VDSO mode %d. Disabling VDSO support.\n",
935934
cs->name, cs->vdso_clock_mode);
936935
cs->vdso_clock_mode = VDSO_CLOCKMODE_NONE;
937936
}
938-
#endif
939937

940938
/* Initialize mult/shift and max_idle_ns */
941939
__clocksource_update_freq_scale(cs, scale, freq);

0 commit comments

Comments
 (0)