[linux] 01/02: Add back the AMD exclusion from KPTI, which is now upstream

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch wheezy-security
in repository linux.

commit be08b25a58508d700360ea7fdc0491fdca2199bd
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Jan 6 00:37:22 2018 +0000

    Add back the AMD exclusion from KPTI, which is now upstream
---
 .../bugfix/all/kpti/x86-kaiser-check-boottime-cmdline-params.patch  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/patches/bugfix/all/kpti/x86-kaiser-check-boottime-cmdline-params.patch b/debian/patches/bugfix/all/kpti/x86-kaiser-check-boottime-cmdline-params.patch
index 5bb5ac8..b2b6141 100644
--- a/debian/patches/bugfix/all/kpti/x86-kaiser-check-boottime-cmdline-params.patch
+++ b/debian/patches/bugfix/all/kpti/x86-kaiser-check-boottime-cmdline-params.patch
@@ -10,7 +10,6 @@ like upstream.
 
 Signed-off-by: Borislav Petkov <bp at suse.de>
 Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
-[bwh: Drop the exclusion of AMD, which does not exist upstream.]
 Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
 ---
  Documentation/kernel-parameters.txt |  6 ++++
@@ -42,7 +41,7 @@ Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
  
  int kaiser_enabled __read_mostly = 1;
  EXPORT_SYMBOL(kaiser_enabled);	/* for inlined TLB flush functions */
-@@ -264,6 +265,40 @@ static void __init kaiser_init_all_pgds(
+@@ -264,6 +265,43 @@ static void __init kaiser_init_all_pgds(
  	WARN_ON(__ret);							\
  } while (0)
  
@@ -68,6 +67,9 @@ Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
 +		goto disable;
 +
 +skip:
++	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
++		goto disable;
++
 +enable:
 +	if (enable)
 +		setup_force_cpu_cap(X86_FEATURE_KAISER);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git