From: Borislav Petkov <[email protected]>

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 <[email protected]>
Cc: Juergen Gross <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
 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

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

Reply via email to