From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 17 Jul 2020 10:20:08 +0000 (+0200)
Subject: fix up queue-5.4/arm64-arch_timer-allow-an-workaround-descriptor-to-disable-compat... 
X-Git-Tag: v4.4.231~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a040ec6d8dff70b052ca470e99f577be6ffda297;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up queue-5.4/arm64-arch_timer-allow-an-workaround-descriptor-to-disable-compat-vdso.patch
---

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 <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;
  	}
  }