]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix up queue-5.4/arm64-arch_timer-allow-an-workaround-descriptor-to-disable-compat...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Jul 2020 10:20:08 +0000 (12:20 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Jul 2020 10:20:08 +0000 (12:20 +0200)
queue-5.4/arm64-arch_timer-allow-an-workaround-descriptor-to-disable-compat-vdso.patch

index 3aca83bba856eeabe20af2ae303da2f18f6cd5aa..39fe3d192ec4dfb37d9e23570fcc407a34b3765c 100644 (file)
@@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                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;
        }
  }