From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752011AbeAJWH3 (ORCPT + 1 other); Wed, 10 Jan 2018 17:07:29 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:58140 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750990AbeAJWH2 (ORCPT ); Wed, 10 Jan 2018 17:07:28 -0500 From: Arnd Bergmann To: David Woodhouse , Thomas Gleixner , x86@kernel.org Cc: Arnd Bergmann , Ingo Molnar , "H. Peter Anvin" , Andy Lutomirski , Laura Abbott , linux-kernel@vger.kernel.org Subject: [PATCH] x86/spectre: hide 'spectre_v2_enabled' when disabled Date: Wed, 10 Jan 2018 23:05:30 +0100 Message-Id: <20180110220554.141703-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:Oam0Jx7oq5CgsD1fo1Z/OhhkcvrkCL70oupQi3aYR9X215yGQyp W5qUcbc48XRFEGQOij8XndlLgyyB9vW4VmFJk8Fe5ABGvMGcy1GLsRhetOqoZsV5p1zFh9z bfiSNC44+1zTxm6vBXqSIlPfe6jklmZPv9sndPv0BPU2ZGa/vRktqd6ohuqnCZ3ipK4xR7e bjMsyXnMvIIDQzqVZkKDQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:xdAJdyt5SYc=:oURnTDxnI+LcKRxEHXDLix OMdk2PhvBKofcbTOzDYE/ysDdtckuzkA71V6+o75ITHdSZarp08boe9B4APL0P0VX0Pe7uoMm t3POVqY65B0KoKbxfQrO9ZclCNrI1wForK75upydxPPkFwVgLwXPxaGZIwZQjbKMKxQPc7WKj ux57Rl0M+H0qYFOJwdsYnQAgRdYRK1elEM5QiXSHoQao/TcLSCCfLiBxE41Lm/U11ygomAp43 PeedVcuuF92uQVk9h1kNXNRgoQR6SI0YV6wegOtWJgCLrNUknT48GeWb8MSHk3SyCMCPCJ3vM rdnrG4xRP81ePAS1WezMeRRTAyZIgcilmZtn6+ni+fF5K2OaRTmNP0OL+don3w0sR0X8ycBIF du1EXSPOgO+NUouh8x4Ynxys2tMFG6QD/VJwFzvkggNwQWllqqA8zjd6t4gDBGDPfIOn+DWjz e8CdESQKd4XlQjzxC8Dtkw1+uFxBFEnXDCH6LqHhuSCe71g/8DS9vh9C58qQq5ZGYg0Da9cl6 r0xtUYtjYydJgZCGZCZhkLQkqWaOJP8tILuUSV33cEP/tXDzmXGj8ltpciEPhVaUEOpm1JGEg s5xSw+PFc82tV98yEPgWvKTAIi8xA3JzoI0Qv7hYcVOyu9aZnppKb7Tgtc79/91vCcC6YoujI MEiqQFLiUnnMY8aO1SnrggQrjuhP+fRr3JyqAaeHSqzqf9vU1W4/FV0DEajwIfE2rdHMG0B9w UxH/guPY3TiGGeS2aFS4cW2IKthKolmbudsbIg== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: gcc prints a harmless warning when both CONFIG_RETPOLINE and CONFIG_SYSFS are disabled: arch/x86/kernel/cpu/bugs.c:79:12: warning: 'spectre_v2_enabled' defined but not used [-Wunused-variable] This hides the spectre_v2_enabled variable from compilation when CONFIG_RETPOLINE is disabled, to avoid that warning. Fixes: 54d5103245ff ("x86/spectre: Add boot time option to select Spectre v2 mitigation") Signed-off-by: Arnd Bergmann --- arch/x86/kernel/cpu/bugs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index b957f771a5b7..6f0105875c3a 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -76,7 +76,9 @@ enum spectre_v2_mitigation { #undef pr_fmt #define pr_fmt(fmt) "Spectre V2 mitigation: " fmt +#ifdef CONFIG_RETPOLINE static int spectre_v2_enabled = SPECTRE_V2_NONE; +#endif static void __init spec2_print_if_insecure(const char *reason) { @@ -195,6 +197,7 @@ ssize_t cpu_show_spectre_v2(struct device *dev, if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V2)) return sprintf(buf, "Not affected\n"); +#ifdef CONFIG_RETPOLINE switch (spectre_v2_enabled) { case SPECTRE_V2_RETPOLINE_MINIMAL: return sprintf(buf, "Mitigation: Minimal generic ASM retpoline\n"); @@ -204,8 +207,8 @@ ssize_t cpu_show_spectre_v2(struct device *dev, return sprintf(buf, "Mitigation: Full generic retpoline\n"); case SPECTRE_V2_RETPOLINE_AMD: return sprintf(buf, "Mitigation: Full AMD retpoline\n"); - default: - return sprintf(buf, "Vulnerable\n"); } +#endif + return sprintf(buf, "Vulnerable\n"); } #endif -- 2.9.0