lkml.org 
[lkml]   [2019]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 9/9] x86/cpu/bugs: Fix __initconst usage in bugs.c
    Date
    From: Andi Kleen <ak@linux.intel.com>

    Fix some of the recently added const tables to use __initconst
    for const data instead of __initdata which causes section attribute
    conflicts.

    Fixes: fa1202ef2243 ("x86/speculation: Add command line control")
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    ---
    arch/x86/kernel/cpu/bugs.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
    index 2da82eff0eb4..b91b3bfa5cfb 100644
    --- a/arch/x86/kernel/cpu/bugs.c
    +++ b/arch/x86/kernel/cpu/bugs.c
    @@ -275,7 +275,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 },
    @@ -419,7 +419,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 },
    @@ -658,7 +658,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 */
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-03-30 01:48    [W:3.046 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site