From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754049AbbKGRPj (ORCPT ); Sat, 7 Nov 2015 12:15:39 -0500 Received: from terminus.zytor.com ([198.137.202.10]:37651 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753711AbbKGRPg (ORCPT ); Sat, 7 Nov 2015 12:15:36 -0500 Date: Sat, 7 Nov 2015 09:12:41 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: luto@kernel.org, akpm@linux-foundation.org, mingo@kernel.org, rusty@rustcorp.com.au, tglx@linutronix.de, linux-kernel@vger.kernel.org, chrisw@sous-sol.org, jeremy@goop.org, peterz@infradead.org, hpa@zytor.com, bp@suse.de, jgross@suse.com Reply-To: jgross@suse.com, peterz@infradead.org, bp@suse.de, hpa@zytor.com, jeremy@goop.org, chrisw@sous-sol.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, rusty@rustcorp.com.au, mingo@kernel.org, luto@kernel.org, akpm@linux-foundation.org In-Reply-To: <1446542329-32037-1-git-send-email-bp@alien8.de> References: <1446542329-32037-1-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cleanups] x86/paravirt: Kill some unused patching functions Git-Commit-ID: 79f1d836925c545b4612f7ed19423f0950978b5e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 79f1d836925c545b4612f7ed19423f0950978b5e Gitweb: http://git.kernel.org/tip/79f1d836925c545b4612f7ed19423f0950978b5e Author: Borislav Petkov AuthorDate: Tue, 3 Nov 2015 10:18:49 +0100 Committer: Thomas Gleixner CommitDate: Sat, 7 Nov 2015 18:09:35 +0100 x86/paravirt: Kill some unused patching functions paravirt_patch_ignore() is completely unused and paravirt_patch_nop() doesn't do a whole lot. Remove them both. Signed-off-by: Borislav Petkov Reviewed-by: Juergen Gross Cc: Andrew Morton Cc: Andy Lutomirski Cc: Chris Wright Cc: Jeremy Fitzhardinge Cc: "Peter Zijlstra (Intel)" Cc: Rusty Russell Cc: virtualization@lists.linux-foundation.org Cc: xen-devel@lists.xenproject.org Link: http://lkml.kernel.org/r/1446542329-32037-1-git-send-email-bp@alien8.de Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/paravirt_types.h | 2 -- arch/x86/kernel/paravirt.c | 13 +------------ 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h index 31247b5..e1f31df 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h @@ -402,10 +402,8 @@ extern struct pv_lock_ops pv_lock_ops; __visible extern const char start_##ops##_##name[], end_##ops##_##name[]; \ asm(NATIVE_LABEL("start_", ops, name) code NATIVE_LABEL("end_", ops, name)) -unsigned paravirt_patch_nop(void); unsigned paravirt_patch_ident_32(void *insnbuf, unsigned len); unsigned paravirt_patch_ident_64(void *insnbuf, unsigned len); -unsigned paravirt_patch_ignore(unsigned len); unsigned paravirt_patch_call(void *insnbuf, const void *target, u16 tgt_clobbers, unsigned long addr, u16 site_clobbers, diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index c2130ae..4f32a10 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -74,16 +74,6 @@ void __init default_banner(void) /* Undefined instruction for dealing with missing ops pointers. */ static const unsigned char ud2a[] = { 0x0f, 0x0b }; -unsigned paravirt_patch_nop(void) -{ - return 0; -} - -unsigned paravirt_patch_ignore(unsigned len) -{ - return len; -} - struct branch { unsigned char opcode; u32 delta; @@ -152,8 +142,7 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf, /* If there's no function, patch it with a ud2a (BUG) */ ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a)); else if (opfunc == _paravirt_nop) - /* If the operation is a nop, then nop the callsite */ - ret = paravirt_patch_nop(); + ret = 0; /* identity functions just return their single argument */ else if (opfunc == _paravirt_ident_32)