From a040ec6d8dff70b052ca470e99f577be6ffda297 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 17 Jul 2020 12:20:08 +0200 Subject: [PATCH] fix up queue-5.4/arm64-arch_timer-allow-an-workaround-descriptor-to-disable-compat-vdso.patch --- ...-allow-an-workaround-descriptor-to-disable-compat-vdso.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/queue-5.4/arm64-arch_timer-allow-an-workaround-descriptor-to-disable-compat-vdso.patch b/queue-5.4/arm64-arch_timer-allow-an-workaround-descriptor-to-disable-compat-vdso.patch index 3aca83bba85..39fe3d192ec 100644 --- a/queue-5.4/arm64-arch_timer-allow-an-workaround-descriptor-to-disable-compat-vdso.patch +++ b/queue-5.4/arm64-arch_timer-allow-an-workaround-descriptor-to-disable-compat-vdso.patch @@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman vdso_default = VDSO_CLOCKMODE_NONE; + } else if (wa->disable_compat_vdso && vdso_default != VDSO_CLOCKMODE_NONE) { + vdso_default = VDSO_CLOCKMODE_ARCHTIMER_NOCOMPAT; -+ clocksource_counter.vdso_clock_mode = vdso_default; ++ clocksource_counter.archdata.clock_mode = vdso_default; } } -- 2.47.3