lkml.org 
[lkml]   [2018]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch V2 03/28] x86/speculation: Remove unnecessary ret variable in cpu_show_common()
    Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

    ---
    arch/x86/kernel/cpu/bugs.c | 5 +----
    1 file changed, 1 insertion(+), 4 deletions(-)

    --- a/arch/x86/kernel/cpu/bugs.c
    +++ b/arch/x86/kernel/cpu/bugs.c
    @@ -847,8 +847,6 @@ static ssize_t l1tf_show_state(char *buf
    static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr,
    char *buf, unsigned int bug)
    {
    - int ret;
    -
    if (!boot_cpu_has_bug(bug))
    return sprintf(buf, "Not affected\n");

    @@ -866,13 +864,12 @@ static ssize_t cpu_show_common(struct de
    return sprintf(buf, "Mitigation: __user pointer sanitization\n");

    case X86_BUG_SPECTRE_V2:
    - ret = sprintf(buf, "%s%s%s%s%s%s\n", spectre_v2_strings[spectre_v2_enabled],
    + return sprintf(buf, "%s%s%s%s%s%s\n", spectre_v2_strings[spectre_v2_enabled],
    boot_cpu_has(X86_FEATURE_USE_IBPB) ? ", IBPB" : "",
    boot_cpu_has(X86_FEATURE_USE_IBRS_FW) ? ", IBRS_FW" : "",
    (x86_spec_ctrl_base & SPEC_CTRL_STIBP) ? ", STIBP" : "",
    boot_cpu_has(X86_FEATURE_RSB_CTXSW) ? ", RSB filling" : "",
    spectre_v2_module_string());
    - return ret;

    case X86_BUG_SPEC_STORE_BYPASS:
    return sprintf(buf, "%s\n", ssb_strings[ssb_mode]);

    \
     
     \ /
      Last update: 2018-11-25 20:00    [W:4.042 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site