]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix build error on 4.9 patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 19 Jan 2018 10:00:56 +0000 (11:00 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 19 Jan 2018 10:00:56 +0000 (11:00 +0100)
queue-4.9/x86-retpoline-fill-rsb-on-context-switch-for-affected-cpus.patch

index 2dd9bab5f35c01b97a447bedd61fdc94c5740da3..5f0b6b13768408aa950bd689b150b8817f499b23 100644 (file)
@@ -160,7 +160,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +       * 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");