[PATCH] x86/paravirt: Get rid of patch_site label

From: Borislav Petkov
Date: Fri Sep 07 2018 - 06:49:29 EST


From: Borislav Petkov <bp@xxxxxxx>

When CONFIG_PARAVIRT_SPINLOCKS=n, it fires

arch/x86/kernel/paravirt_patch_64.c: In function ânative_patchâ:
arch/x86/kernel/paravirt_patch_64.c:89:1: warning: label âpatch_siteâ defined but not used [-Wunused-label]
patch_site:

but that label can simply be removed by directly calling
paravirt_patch_insns() there.

Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Cc: Juergen Gross <jgross@xxxxxxxx>
Cc: x86@xxxxxxxxxx
Cc: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
---
arch/x86/kernel/paravirt_patch_64.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
index 5ad5bcda9dc6..f09d264cbd2d 100644
--- a/arch/x86/kernel/paravirt_patch_64.c
+++ b/arch/x86/kernel/paravirt_patch_64.c
@@ -76,7 +76,8 @@ unsigned native_patch(u8 type, void *ibuf, unsigned long addr, unsigned len)
if (pv_is_native_vcpu_is_preempted()) {
start = start_lock_vcpu_is_preempted;
end = end_lock_vcpu_is_preempted;
- goto patch_site;
+
+ return paravirt_patch_insns(ibuf, len, start, end);
}
goto patch_default;
#endif
@@ -86,7 +87,6 @@ patch_default: __maybe_unused
ret = paravirt_patch_default(type, ibuf, addr, len);
break;

-patch_site:
ret = paravirt_patch_insns(ibuf, len, start, end);
break;
}
--
2.17.0.582.gccdcbd54c