On Sun, Nov 25, 2018 at 07:33:31PM +0100, Thomas Gleixner wrote:
> Signed-off-by: Tim Chen <tim.c.c...@linux.intel.com>
> Signed-off-by: Thomas Gleixner <t...@linutronix.de>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
Thank you!
>
> ---
> 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]);
>
>
