From be3a8ec97a29ffc9a1aada3e92abf774fb96d03a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 19 Jan 2018 11:00:56 +0100 Subject: [PATCH] fix build error on 4.9 patch --- ...retpoline-fill-rsb-on-context-switch-for-affected-cpus.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/queue-4.9/x86-retpoline-fill-rsb-on-context-switch-for-affected-cpus.patch b/queue-4.9/x86-retpoline-fill-rsb-on-context-switch-for-affected-cpus.patch index 2dd9bab5f35..5f0b6b13768 100644 --- a/queue-4.9/x86-retpoline-fill-rsb-on-context-switch-for-affected-cpus.patch +++ b/queue-4.9/x86-retpoline-fill-rsb-on-context-switch-for-affected-cpus.patch @@ -160,7 +160,7 @@ Signed-off-by: Greg Kroah-Hartman + * or deactivated in favour of retpolines the RSB fill on context + * switch is required. + */ -+ if ((!boot_cpu_has(X86_FEATURE_PTI) && ++ if ((!boot_cpu_has(X86_FEATURE_KAISER) && + !boot_cpu_has(X86_FEATURE_SMEP)) || is_skylake_era()) { + setup_force_cpu_cap(X86_FEATURE_RSB_CTXSW); + pr_info("Filling RSB on context switch\n"); -- 2.47.3