diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2019-05-14 23:13:22 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-05-14 23:13:22 +0100 |
| commit | 504f9024e7d7a5769408cc3f0cb95109e040201d (patch) | |
| tree | 03ba997925af057aa5be45923e8289ed76ac5fb9 | |
| parent | 28c735d20e8e7f16bdde6b3d95f2e737ab225f49 (diff) | |
| download | linux-stable-queue-504f9024e7d7a5769408cc3f0cb95109e040201d.tar.gz | |
Change L1TF mitigation string to match upstream
| -rw-r--r-- | queue-3.16/series | 1 | ||||
| -rw-r--r-- | queue-3.16/x86-bugs-change-l1tf-mitigation-string-to-match-upstream.patch | 23 |
2 files changed, 24 insertions, 0 deletions
diff --git a/queue-3.16/series b/queue-3.16/series index a08968a6..7a55cbbd 100644 --- a/queue-3.16/series +++ b/queue-3.16/series @@ -83,3 +83,4 @@ x86-mds-add-mdsum-variant-to-the-mds-documentation.patch documentation-correct-the-possible-mds-sysfs-values.patch x86-speculation-mds-fix-documentation-typo.patch x86-cpu-bugs-use-__initconst-for-const-init-data.patch +x86-bugs-change-l1tf-mitigation-string-to-match-upstream.patch diff --git a/queue-3.16/x86-bugs-change-l1tf-mitigation-string-to-match-upstream.patch b/queue-3.16/x86-bugs-change-l1tf-mitigation-string-to-match-upstream.patch new file mode 100644 index 00000000..a0035b44 --- /dev/null +++ b/queue-3.16/x86-bugs-change-l1tf-mitigation-string-to-match-upstream.patch @@ -0,0 +1,23 @@ +From: Ben Hutchings <ben@decadent.org.uk> +Date: Tue, 14 May 2019 13:46:46 +0100 +Subject: x86/bugs: Change L1TF mitigation string to match upstream + +Commit 72c6d2db64fa "x86/litf: Introduce vmx status variable" upstream +changed "Page Table Inversion" to "PTE Inversion". That was part of +the implementation of additional mitigations for VMX which haven't +been applied to this branch. Just change this string to be consistent +and match documentation. + +Signed-off-by: Ben Hutchings <ben@decadent.org.uk> +--- +--- a/arch/x86/kernel/cpu/bugs.c ++++ b/arch/x86/kernel/cpu/bugs.c +@@ -1225,7 +1225,7 @@ static ssize_t cpu_show_common(struct de + + case X86_BUG_L1TF: + if (boot_cpu_has(X86_FEATURE_L1TF_PTEINV)) +- return sprintf(buf, "Mitigation: Page Table Inversion\n"); ++ return sprintf(buf, "Mitigation: PTE Inversion\n"); + break; + + case X86_BUG_MDS: |