mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Arnd Bergmann" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>,
	"Borislav Petkov (AMD)" <bp@alien8.de>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/cleanups] x86/paravirt: Silence unused native_pv_lock_init() function warning
Date: Thu, 03 Aug 2023 15:59:13 -0000	[thread overview]
Message-ID: <169107835342.28540.9038195913134250351.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20230803082619.1369127-7-arnd@kernel.org>

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

Commit-ID:     ce0a1b608bfc709cf366f020b520310a3b3272c3
Gitweb:        https://git.kernel.org/tip/ce0a1b608bfc709cf366f020b520310a3b3272c3
Author:        Arnd Bergmann <arnd@arndb.de>
AuthorDate:    Thu, 03 Aug 2023 10:26:18 +02:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Thu, 03 Aug 2023 16:50:19 +02:00

x86/paravirt: Silence unused native_pv_lock_init() function warning

The native_pv_lock_init() function is only used in SMP configurations
and declared in asm/qspinlock.h which is not used in UP kernels, but
the function is still defined for both, which causes a warning:

  arch/x86/kernel/paravirt.c:76:13: error: no previous prototype for 'native_pv_lock_init' [-Werror=missing-prototypes]

Move the declaration to asm/paravirt.h so it is visible even
with CONFIG_SMP but short-circuit the definition to turn it
into an empty function.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230803082619.1369127-7-arnd@kernel.org
---
 arch/x86/include/asm/paravirt.h  | 7 +++++++
 arch/x86/include/asm/qspinlock.h | 7 +------
 arch/x86/kernel/paravirt.c       | 3 ++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index b497786..6c8ff12 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -739,6 +739,7 @@ static __always_inline unsigned long arch_local_irq_save(void)
 	     ".popsection")
 
 extern void default_banner(void);
+void native_pv_lock_init(void) __init;
 
 #else  /* __ASSEMBLY__ */
 
@@ -778,6 +779,12 @@ extern void default_banner(void);
 #endif /* __ASSEMBLY__ */
 #else  /* CONFIG_PARAVIRT */
 # define default_banner x86_init_noop
+
+#ifndef __ASSEMBLY__
+static inline void native_pv_lock_init(void)
+{
+}
+#endif
 #endif /* !CONFIG_PARAVIRT */
 
 #ifndef __ASSEMBLY__
diff --git a/arch/x86/include/asm/qspinlock.h b/arch/x86/include/asm/qspinlock.h
index d87451d..cde8357 100644
--- a/arch/x86/include/asm/qspinlock.h
+++ b/arch/x86/include/asm/qspinlock.h
@@ -74,8 +74,6 @@ static inline bool vcpu_is_preempted(long cpu)
  */
 DECLARE_STATIC_KEY_TRUE(virt_spin_lock_key);
 
-void native_pv_lock_init(void) __init;
-
 /*
  * Shortcut for the queued_spin_lock_slowpath() function that allows
  * virt to hijack it.
@@ -103,10 +101,7 @@ static inline bool virt_spin_lock(struct qspinlock *lock)
 
 	return true;
 }
-#else
-static inline void native_pv_lock_init(void)
-{
-}
+
 #endif /* CONFIG_PARAVIRT */
 
 #include <asm-generic/qspinlock.h>
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index ac10b46..32e94a3 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -75,7 +75,8 @@ DEFINE_STATIC_KEY_TRUE(virt_spin_lock_key);
 
 void __init native_pv_lock_init(void)
 {
-	if (!boot_cpu_has(X86_FEATURE_HYPERVISOR))
+	if (IS_ENABLED(CONFIG_PARAVIRT_SPINLOCKS) &&
+	    !boot_cpu_has(X86_FEATURE_HYPERVISOR))
 		static_branch_disable(&virt_spin_lock_key);
 }
 

  reply	other threads:[~2023-08-03 15:59 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-03  8:26 [PATCH v3 0/7] x86: remaining -Wmissing-prototype warning fixes Arnd Bergmann
2023-08-03  8:26 ` [PATCH v3 1/7] x86: Fix amd_check_microcode() declaration Arnd Bergmann
2023-08-03  8:26 ` [PATCH v3 2/7] x86: apic: hide unused safe_smp_processor_id on UP Arnd Bergmann
2023-08-03  8:26 ` [PATCH v3 3/7] x86: avoid unneeded __div64_32 function definition Arnd Bergmann
2023-08-03 15:59   ` [tip: x86/cleanups] x86/asm: Avoid " tip-bot2 for Arnd Bergmann
2023-08-03  8:26 ` [PATCH v3 4/7] x86: purgatory: include header for warn() declaration Arnd Bergmann
2023-08-03 15:59   ` [tip: x86/cleanups] x86/purgatory: Include " tip-bot2 for Arnd Bergmann
2023-08-03  8:26 ` [PATCH v3 5/7] x86: alternative: add __alt_reloc_selftest prototype Arnd Bergmann
2023-08-03 15:59   ` [tip: x86/cleanups] x86/alternative: Add a __alt_reloc_selftest() prototype tip-bot2 for Arnd Bergmann
2023-08-03  8:26 ` [PATCH v3 6/7] x86: paravirt: shut up unused native_pv_lock_init() function warning Arnd Bergmann
2023-08-03 15:59   ` tip-bot2 for Arnd Bergmann [this message]
2023-08-03  8:26 ` [PATCH v3 7/7] x86: qspinlock-paravirt: fix mising-prototype warning Arnd Bergmann
2023-08-03 15:59   ` [tip: x86/cleanups] x86/qspinlock-paravirt: Fix missing-prototype warning tip-bot2 for Arnd Bergmann
2023-08-03 10:04 ` [PATCH v3 0/7] x86: remaining -Wmissing-prototype warning fixes Borislav Petkov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=169107835342.28540.9038195913134250351.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=arnd@arndb.de \
    --cc=bp@alien8.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®