lkml.org 
[lkml]   [2019]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.0 096/115] x86/cpu/bugs: Use __initconst for const init data
    Date
    From: Andi Kleen <ak@linux.intel.com>

    commit 1de7edbb59c8f1b46071f66c5c97b8a59569eb51 upstream.

    Some of the recently added const tables use __initdata which causes section
    attribute conflicts.

    Use __initconst instead.

    Fixes: fa1202ef2243 ("x86/speculation: Add command line control")
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: stable@vger.kernel.org
    Link: https://lkml.kernel.org/r/20190330004743.29541-9-andi@firstfloor.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/kernel/cpu/bugs.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- 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 */

    \
     
     \ /
      Last update: 2019-04-24 19:40    [W:4.039 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site