linux-kernel - [tip: x86/microcode] x86/microcode/AMD: Make stub function static inline

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Thu, 12 Dec 2019 21:33:55 -0000
From:   tip-bot2 for Valdis Klētnieks 
        <tip-bot2@...utronix.de>
To:     linux-tip-commits@...r.kernel.org
Cc:     valdis.kletnieks@...edu, Borislav Petkov <bp@...e.de>,
        Luc Van Oostenryck <luc.vanoostenryck@...il.com>,
        x86@...nel.org, LKML <linux-kernel@...r.kernel.org>
Subject: [tip: x86/microcode] x86/microcode/AMD: Make stub function static inline

The following commit has been merged into the x86/microcode branch of tip:

Commit-ID:     82c881b28aa89215a760e39c5f6bcde2d6ce4918
Gitweb:        https://git.kernel.org/tip/82c881b28aa89215a760e39c5f6bcde2d6ce4918
Author:        Valdis Klētnieks <valdis.kletnieks@...edu>
AuthorDate:    Thu, 05 Dec 2019 22:44:33 -05:00
Committer:     Borislav Petkov <bp@...e.de>
CommitterDate: Thu, 12 Dec 2019 22:29:00 +01:00

x86/microcode/AMD: Make stub function static inline

When building with C=1 W=1 (and when CONFIG_MICROCODE_AMD=n, as Luc Van
Oostenryck correctly points out) both sparse and gcc complain:

  CHECK   arch/x86/kernel/cpu/microcode/core.c
  ./arch/x86/include/asm/microcode_amd.h:56:6: warning: symbol \
	  'reload_ucode_amd' was not declared. Should it be static?
    CC      arch/x86/kernel/cpu/microcode/core.o
  In file included from arch/x86/kernel/cpu/microcode/core.c:36:
  ./arch/x86/include/asm/microcode_amd.h:56:6: warning: no previous \
	  prototype for 'reload_ucode_amd' [-Wmissing-prototypes]
     56 | void reload_ucode_amd(void) {}
        |      ^~~~~~~~~~~~~~~~

And they're right - that function can be a static inline like its
brethren.

Signed-off-by: Valdis Klētnieks <valdis.kletnieks@...edu>
Signed-off-by: Borislav Petkov <bp@...e.de>
Cc: Luc Van Oostenryck <luc.vanoostenryck@...il.com>
Cc: x86@...nel.org
Link: https://lkml.kernel.org/r/52170.1575603873@turing-police
---
 arch/x86/include/asm/microcode_amd.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/microcode_amd.h b/arch/x86/include/asm/microcode_amd.h
index 2094928..6685e12 100644
--- a/arch/x86/include/asm/microcode_amd.h
+++ b/arch/x86/include/asm/microcode_amd.h
@@ -53,6 +53,6 @@ static inline void __init load_ucode_amd_bsp(unsigned int family) {}
 static inline void load_ucode_amd_ap(unsigned int family) {}
 static inline int __init
 save_microcode_in_initrd_amd(unsigned int family) { return -EINVAL; }
-void reload_ucode_amd(void) {}
+static inline void reload_ucode_amd(void) {}
 #endif
 #endif /* _ASM_X86_MICROCODE_AMD_H */