From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH v3 05/15] x86/paravirt: make paravirt_patch_call() and paravirt_patch_jmp() static Date: Tue, 28 Aug 2018 09:40:16 +0200 Message-ID: <20180828074026.820-6-jgross@suse.com> References: <20180828074026.820-1-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1fuYcD-0000Fl-1I for xen-devel@lists.xenproject.org; Tue, 28 Aug 2018 07:40:41 +0000 In-Reply-To: <20180828074026.820-1-jgross@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, x86@kernel.org, virtualization@lists.linux-foundation.org Cc: Juergen Gross , boris.ostrovsky@oracle.com, rusty@rustcorp.com.au, mingo@redhat.com, hpa@zytor.com, akataria@vmware.com, tglx@linutronix.de List-Id: xen-devel@lists.xenproject.org cGFyYXZpcnRfcGF0Y2hfY2FsbCgpIGFuZCBwYXJhdmlydF9wYXRjaF9qbXAoKSBhcmUgdXNlZCBp biBwYXJhdmlydC5jCm9ubHkuIENvbnZlcnQgdGhlbSB0byBzdGF0aWMuCgpTaWduZWQtb2ZmLWJ5 OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5jb20+ClJldmlld2VkLWJ5OiBUaG9tYXMgR2xl aXhuZXIgPHRnbHhAbGludXRyb25peC5kZT4KLS0tCiBhcmNoL3g4Ni9pbmNsdWRlL2FzbS9wYXJh dmlydF90eXBlcy5oIHwgIDYgLS0tLS0tCiBhcmNoL3g4Ni9rZXJuZWwvcGFyYXZpcnQuYyAgICAg ICAgICAgIHwgMTIgKysrKysrLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygr KSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYvaW5jbHVkZS9hc20vcGFy YXZpcnRfdHlwZXMuaCBiL2FyY2gveDg2L2luY2x1ZGUvYXNtL3BhcmF2aXJ0X3R5cGVzLmgKaW5k ZXggNGI3NWFjYzIzYjMwLi43ZDEzMTk3ZDc2MGIgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L2luY2x1 ZGUvYXNtL3BhcmF2aXJ0X3R5cGVzLmgKKysrIGIvYXJjaC94ODYvaW5jbHVkZS9hc20vcGFyYXZp cnRfdHlwZXMuaApAQCAtMzczLDEyICszNzMsNiBAQCBleHRlcm4gc3RydWN0IHB2X2xvY2tfb3Bz IHB2X2xvY2tfb3BzOwogCiB1bnNpZ25lZCBwYXJhdmlydF9wYXRjaF9pZGVudF8zMih2b2lkICpp bnNuYnVmLCB1bnNpZ25lZCBsZW4pOwogdW5zaWduZWQgcGFyYXZpcnRfcGF0Y2hfaWRlbnRfNjQo dm9pZCAqaW5zbmJ1ZiwgdW5zaWduZWQgbGVuKTsKLXVuc2lnbmVkIHBhcmF2aXJ0X3BhdGNoX2Nh bGwodm9pZCAqaW5zbmJ1ZiwKLQkJCSAgICAgY29uc3Qgdm9pZCAqdGFyZ2V0LCB1MTYgdGd0X2Ns b2JiZXJzLAotCQkJICAgICB1bnNpZ25lZCBsb25nIGFkZHIsIHUxNiBzaXRlX2Nsb2JiZXJzLAot CQkJICAgICB1bnNpZ25lZCBsZW4pOwotdW5zaWduZWQgcGFyYXZpcnRfcGF0Y2hfam1wKHZvaWQg Kmluc25idWYsIGNvbnN0IHZvaWQgKnRhcmdldCwKLQkJCSAgICB1bnNpZ25lZCBsb25nIGFkZHIs IHVuc2lnbmVkIGxlbik7CiB1bnNpZ25lZCBwYXJhdmlydF9wYXRjaF9kZWZhdWx0KHU4IHR5cGUs IHUxNiBjbG9iYmVycywgdm9pZCAqaW5zbmJ1ZiwKIAkJCQl1bnNpZ25lZCBsb25nIGFkZHIsIHVu c2lnbmVkIGxlbik7CiAKZGlmZiAtLWdpdCBhL2FyY2gveDg2L2tlcm5lbC9wYXJhdmlydC5jIGIv YXJjaC94ODYva2VybmVsL3BhcmF2aXJ0LmMKaW5kZXggYWZkYjMwMzI4NWY4Li4xYWJkYmRlMzUw NDkgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L2tlcm5lbC9wYXJhdmlydC5jCisrKyBiL2FyY2gveDg2 L2tlcm5lbC9wYXJhdmlydC5jCkBAIC04MSwxMCArODEsMTAgQEAgc3RydWN0IGJyYW5jaCB7CiAJ dTMyIGRlbHRhOwogfSBfX2F0dHJpYnV0ZV9fKChwYWNrZWQpKTsKIAotdW5zaWduZWQgcGFyYXZp cnRfcGF0Y2hfY2FsbCh2b2lkICppbnNuYnVmLAotCQkJICAgICBjb25zdCB2b2lkICp0YXJnZXQs IHUxNiB0Z3RfY2xvYmJlcnMsCi0JCQkgICAgIHVuc2lnbmVkIGxvbmcgYWRkciwgdTE2IHNpdGVf Y2xvYmJlcnMsCi0JCQkgICAgIHVuc2lnbmVkIGxlbikKK3N0YXRpYyB1bnNpZ25lZCBwYXJhdmly dF9wYXRjaF9jYWxsKHZvaWQgKmluc25idWYsCisJCQkJICAgIGNvbnN0IHZvaWQgKnRhcmdldCwg dTE2IHRndF9jbG9iYmVycywKKwkJCQkgICAgdW5zaWduZWQgbG9uZyBhZGRyLCB1MTYgc2l0ZV9j bG9iYmVycywKKwkJCQkgICAgdW5zaWduZWQgbGVuKQogewogCXN0cnVjdCBicmFuY2ggKmIgPSBp bnNuYnVmOwogCXVuc2lnbmVkIGxvbmcgZGVsdGEgPSAodW5zaWduZWQgbG9uZyl0YXJnZXQgLSAo YWRkcis1KTsKQEAgLTEwMyw4ICsxMDMsOCBAQCB1bnNpZ25lZCBwYXJhdmlydF9wYXRjaF9jYWxs KHZvaWQgKmluc25idWYsCiAJcmV0dXJuIDU7CiB9CiAKLXVuc2lnbmVkIHBhcmF2aXJ0X3BhdGNo X2ptcCh2b2lkICppbnNuYnVmLCBjb25zdCB2b2lkICp0YXJnZXQsCi0JCQkgICAgdW5zaWduZWQg bG9uZyBhZGRyLCB1bnNpZ25lZCBsZW4pCitzdGF0aWMgdW5zaWduZWQgcGFyYXZpcnRfcGF0Y2hf am1wKHZvaWQgKmluc25idWYsIGNvbnN0IHZvaWQgKnRhcmdldCwKKwkJCQkgICB1bnNpZ25lZCBs b25nIGFkZHIsIHVuc2lnbmVkIGxlbikKIHsKIAlzdHJ1Y3QgYnJhbmNoICpiID0gaW5zbmJ1ZjsK IAl1bnNpZ25lZCBsb25nIGRlbHRhID0gKHVuc2lnbmVkIGxvbmcpdGFyZ2V0IC0gKGFkZHIrNSk7 Ci0tIAoyLjE2LjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9y ZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFA57C433F4 for ; Tue, 28 Aug 2018 07:41:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB412208E1 for ; Tue, 28 Aug 2018 07:41:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB412208E1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727360AbeH1LbB (ORCPT ); Tue, 28 Aug 2018 07:31:01 -0400 Received: from mx2.suse.de ([195.135.220.15]:45324 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727203AbeH1LbA (ORCPT ); Tue, 28 Aug 2018 07:31:00 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 2D3B0AF7A; Tue, 28 Aug 2018 07:40:38 +0000 (UTC) From: Juergen Gross To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, x86@kernel.org, virtualization@lists.linux-foundation.org Cc: akataria@vmware.com, rusty@rustcorp.com.au, boris.ostrovsky@oracle.com, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, Juergen Gross Subject: [PATCH v3 05/15] x86/paravirt: make paravirt_patch_call() and paravirt_patch_jmp() static Date: Tue, 28 Aug 2018 09:40:16 +0200 Message-Id: <20180828074026.820-6-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180828074026.820-1-jgross@suse.com> References: <20180828074026.820-1-jgross@suse.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org paravirt_patch_call() and paravirt_patch_jmp() are used in paravirt.c only. Convert them to static. Signed-off-by: Juergen Gross Reviewed-by: Thomas Gleixner --- arch/x86/include/asm/paravirt_types.h | 6 ------ arch/x86/kernel/paravirt.c | 12 ++++++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h index 4b75acc23b30..7d13197d760b 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h @@ -373,12 +373,6 @@ extern struct pv_lock_ops pv_lock_ops; unsigned paravirt_patch_ident_32(void *insnbuf, unsigned len); unsigned paravirt_patch_ident_64(void *insnbuf, unsigned len); -unsigned paravirt_patch_call(void *insnbuf, - const void *target, u16 tgt_clobbers, - unsigned long addr, u16 site_clobbers, - unsigned len); -unsigned paravirt_patch_jmp(void *insnbuf, const void *target, - unsigned long addr, unsigned len); unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf, unsigned long addr, unsigned len); diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index afdb303285f8..1abdbde35049 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -81,10 +81,10 @@ struct branch { u32 delta; } __attribute__((packed)); -unsigned paravirt_patch_call(void *insnbuf, - const void *target, u16 tgt_clobbers, - unsigned long addr, u16 site_clobbers, - unsigned len) +static unsigned paravirt_patch_call(void *insnbuf, + const void *target, u16 tgt_clobbers, + unsigned long addr, u16 site_clobbers, + unsigned len) { struct branch *b = insnbuf; unsigned long delta = (unsigned long)target - (addr+5); @@ -103,8 +103,8 @@ unsigned paravirt_patch_call(void *insnbuf, return 5; } -unsigned paravirt_patch_jmp(void *insnbuf, const void *target, - unsigned long addr, unsigned len) +static unsigned paravirt_patch_jmp(void *insnbuf, const void *target, + unsigned long addr, unsigned len) { struct branch *b = insnbuf; unsigned long delta = (unsigned long)target - (addr+5); -- 2.16.4