diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2019-05-03 17:04:31 -0500 |
|---|---|---|
| committer | Tom Zanussi <tom.zanussi@linux.intel.com> | 2019-05-03 17:04:31 -0500 |
| commit | 997f3e86b613be529c5e97caeac52631ab794ff2 (patch) | |
| tree | 9dccc1d021abcef7e5cfa731fb994cd9a2ed8167 /arch/x86/kernel/cpu/bugs.c | |
| parent | 10cf3d90ae1dedfe478287af1d0ee0e006623453 (diff) | |
| parent | fa5941f45d7ed070118b7c209b7f2c3a034293bd (diff) | |
| download | linux-rt-997f3e86b613be529c5e97caeac52631ab794ff2.tar.gz | |
Merge tag 'v4.14.114' into v4.14-rt
This is the 4.14.114 stable release
Conflicts:
kernel/sched/fair.c
Diffstat (limited to 'arch/x86/kernel/cpu/bugs.c')
| -rw-r--r-- | arch/x86/kernel/cpu/bugs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index ec7aedba3d74..5567705e0601 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -271,7 +271,7 @@ static const struct { const char *option; enum spectre_v2_user_cmd cmd; bool secure; -} v2_user_options[] __initdata = { +} v2_user_options[] __initconst = { { "auto", SPECTRE_V2_USER_CMD_AUTO, false }, { "off", SPECTRE_V2_USER_CMD_NONE, false }, { "on", SPECTRE_V2_USER_CMD_FORCE, true }, @@ -406,7 +406,7 @@ static const struct { const char *option; enum spectre_v2_mitigation_cmd cmd; bool secure; -} mitigation_options[] __initdata = { +} mitigation_options[] __initconst = { { "off", SPECTRE_V2_CMD_NONE, false }, { "on", SPECTRE_V2_CMD_FORCE, true }, { "retpoline", SPECTRE_V2_CMD_RETPOLINE, false }, @@ -642,7 +642,7 @@ static const char * const ssb_strings[] = { static const struct { const char *option; enum ssb_mitigation_cmd cmd; -} ssb_mitigation_options[] __initdata = { +} ssb_mitigation_options[] __initconst = { { "auto", SPEC_STORE_BYPASS_CMD_AUTO }, /* Platform decides */ { "on", SPEC_STORE_BYPASS_CMD_ON }, /* Disable Speculative Store Bypass */ { "off", SPEC_STORE_BYPASS_CMD_NONE }, /* Don't touch Speculative Store Bypass */ |