From: Arnd Bergmann <arnd@arndb.de>
To: Ingo Molnar <mingo@redhat.com>, x86@kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>,
Peter Zijlstra <peterz@infradead.org>,
linux-kernel@vger.kernel.org,
virtualization@lists.linux-foundation.org,
"H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH] x86/paravirt: hide unused patch_default label
Date: Fri, 16 Dec 2016 10:16:35 +0100 [thread overview]
Message-ID: <20161216091700.2499520-1-arnd@arndb.de> (raw)
A bugfix introduced a harmless warning:
arch/x86/kernel/paravirt_patch_32.c: In function 'native_patch':
arch/x86/kernel/paravirt_patch_32.c:71:1: error: label 'patch_default' defined but not used [-Werror=unused-label]
This puts it in the same #ifdef as its caller.
Fixes: 45dbea5f55c0 ("x86/paravirt: Fix native_patch()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/x86/kernel/paravirt_patch_32.c | 2 ++
arch/x86/kernel/paravirt_patch_64.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/arch/x86/kernel/paravirt_patch_32.c b/arch/x86/kernel/paravirt_patch_32.c
index d33ef165b1f8..2b729b1df391 100644
--- a/arch/x86/kernel/paravirt_patch_32.c
+++ b/arch/x86/kernel/paravirt_patch_32.c
@@ -68,7 +68,9 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
#endif
default:
+#if defined(CONFIG_PARAVIRT_SPINLOCKS)
patch_default:
+#endif
ret = paravirt_patch_default(type, clobbers, ibuf, addr, len);
break;
diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
index f4fcf26c9fce..b5bff128949a 100644
--- a/arch/x86/kernel/paravirt_patch_64.c
+++ b/arch/x86/kernel/paravirt_patch_64.c
@@ -80,7 +80,9 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
#endif
default:
+#if defined(CONFIG_PARAVIRT_SPINLOCKS)
patch_default:
+#endif
ret = paravirt_patch_default(type, clobbers, ibuf, addr, len);
break;
--
2.9.0
next reply other threads:[~2016-12-16 9:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-16 9:16 Arnd Bergmann [this message]
2016-12-16 9:51 ` [PATCH] x86/paravirt: hide unused patch_default label Peter Zijlstra
2016-12-16 10:07 ` Arnd Bergmann
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=20161216091700.2499520-1-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=virtualization@lists.linux-foundation.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