projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 1f91e7a4 GKH |
1 | From foo@baz Tue 14 May 2019 08:29:35 PM CEST |
| 2 | From: Thomas Gleixner <tglx@linutronix.de> | |
| 3 | Date: Sun, 25 Nov 2018 19:33:42 +0100 | |
| 4 | Subject: x86/speculation: Mark string arrays const correctly | |
| 5 | ||
| 6 | From: Thomas Gleixner <tglx@linutronix.de> | |
| 7 | ||
| 8 | commit 8770709f411763884535662744a3786a1806afd3 upstream. | |
| 9 | ||
| 10 | checkpatch.pl muttered when reshuffling the code: | |
| 11 | WARNING: static const char * array should probably be static const char * const | |
| 12 | ||
| 13 | Fix up all the string arrays. | |
| 14 | ||
| 15 | Signed-off-by: Thomas Gleixner <tglx@linutronix.de> | |
| 16 | Reviewed-by: Ingo Molnar <mingo@kernel.org> | |
| 17 | Cc: Peter Zijlstra <peterz@infradead.org> | |
| 18 | Cc: Andy Lutomirski <luto@kernel.org> | |
| 19 | Cc: Linus Torvalds <torvalds@linux-foundation.org> | |
| 20 | Cc: Jiri Kosina <jkosina@suse.cz> | |
| 21 | Cc: Tom Lendacky <thomas.lendacky@amd.com> | |
| 22 | Cc: Josh Poimboeuf <jpoimboe@redhat.com> | |
| 23 | Cc: Andrea Arcangeli <aarcange@redhat.com> | |
| 24 | Cc: David Woodhouse <dwmw@amazon.co.uk> | |
| 25 | Cc: Tim Chen <tim.c.chen@linux.intel.com> | |
| 26 | Cc: Andi Kleen <ak@linux.intel.com> | |
| 27 | Cc: Dave Hansen <dave.hansen@intel.com> | |
| 28 | Cc: Casey Schaufler <casey.schaufler@intel.com> | |
| 29 | Cc: Asit Mallick <asit.k.mallick@intel.com> | |
| 30 | Cc: Arjan van de Ven <arjan@linux.intel.com> | |
| 31 | Cc: Jon Masters <jcm@redhat.com> | |
| 32 | Cc: Waiman Long <longman9394@gmail.com> | |
| 33 | Cc: Greg KH <gregkh@linuxfoundation.org> | |
| 34 | Cc: Dave Stewart <david.c.stewart@intel.com> | |
| 35 | Cc: Kees Cook <keescook@chromium.org> | |
| 36 | Link: https://lkml.kernel.org/r/20181125185004.800018931@linutronix.de | |
| 37 | [bwh: Backported to 4.4: drop the part for KVM mitigation modes] | |
| 38 | Signed-off-by: Ben Hutchings <ben@decadent.org.uk> | |
| 39 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 40 | --- | |
| 41 | arch/x86/kernel/cpu/bugs.c | 4 ++-- | |
| 42 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
| 43 | ||
| 44 | --- a/arch/x86/kernel/cpu/bugs.c | |
| 45 | +++ b/arch/x86/kernel/cpu/bugs.c | |
| 46 | @@ -227,7 +227,7 @@ enum spectre_v2_mitigation_cmd { | |
| 47 | SPECTRE_V2_CMD_RETPOLINE_AMD, | |
| 48 | }; | |
| 49 | ||
| 50 | -static const char *spectre_v2_strings[] = { | |
| 51 | +static const char * const spectre_v2_strings[] = { | |
| 52 | [SPECTRE_V2_NONE] = "Vulnerable", | |
| 53 | [SPECTRE_V2_RETPOLINE_MINIMAL] = "Vulnerable: Minimal generic ASM retpoline", | |
| 54 | [SPECTRE_V2_RETPOLINE_MINIMAL_AMD] = "Vulnerable: Minimal AMD ASM retpoline", | |
| 55 | @@ -473,7 +473,7 @@ enum ssb_mitigation_cmd { | |
| 56 | SPEC_STORE_BYPASS_CMD_SECCOMP, | |
| 57 | }; | |
| 58 | ||
| 59 | -static const char *ssb_strings[] = { | |
| 60 | +static const char * const ssb_strings[] = { | |
| 61 | [SPEC_STORE_BYPASS_NONE] = "Vulnerable", | |
| 62 | [SPEC_STORE_BYPASS_DISABLE] = "Mitigation: Speculative Store Bypass disabled", | |
| 63 | [SPEC_STORE_BYPASS_PRCTL] = "Mitigation: Speculative Store Bypass disabled via prctl", |