[tip:,x86/cleanups] x86/apic: Hide unused safe_smp_processor_id() on 32-bit UP

Message ID 169107835581.28540.12068505666604846343.tip-bot2@tip-bot2
State New
Headers
Series [tip:,x86/cleanups] x86/apic: Hide unused safe_smp_processor_id() on 32-bit UP |

Commit Message

tip-bot2 for Thomas Gleixner Aug. 3, 2023, 3:59 p.m. UTC
  The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     ac1c6283c45a77431af33fbae435f1a29f23a9f4
Gitweb:        https://git.kernel.org/tip/ac1c6283c45a77431af33fbae435f1a29f23a9f4
Author:        Arnd Bergmann <arnd@arndb.de>
AuthorDate:    Tue, 25 Jul 2023 15:48:33 +02:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Mon, 31 Jul 2023 11:32:25 +02:00

x86/apic: Hide unused safe_smp_processor_id() on 32-bit UP

When CONFIG_SMP is disabled in a 32-bit config, the prototype for
safe_smp_processor_id() is hidden, which causes a W=1 warning:

  arch/x86/kernel/apic/ipi.c:316:5: error: no previous prototype for 'safe_smp_processor_id' [-Werror=missing-prototypes]

Since there are no callers in this configuration, just hide the definition
as well.

  [ bp: Clarify it is a 32-bit config. ]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230725134837.1534228-2-arnd@kernel.org
---
 arch/x86/kernel/apic/ipi.c | 2 ++
 1 file changed, 2 insertions(+)
  

Patch

diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c
index 2a6509e..9bfd6e3 100644
--- a/arch/x86/kernel/apic/ipi.c
+++ b/arch/x86/kernel/apic/ipi.c
@@ -301,6 +301,7 @@  void default_send_IPI_mask_logical(const struct cpumask *cpumask, int vector)
 	local_irq_restore(flags);
 }
 
+#ifdef CONFIG_SMP
 /* must come after the send_IPI functions above for inlining */
 static int convert_apicid_to_cpu(int apic_id)
 {
@@ -329,3 +330,4 @@  int safe_smp_processor_id(void)
 	return cpuid >= 0 ? cpuid : 0;
 }
 #endif
+#endif