Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79f1d836 authored by Borislav Petkov's avatar Borislav Petkov Committed by Thomas Gleixner
Browse files

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: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
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: default avatarThomas Gleixner <tglx@linutronix.de>
parent 66ef3493

arch/x86/include/asm/paravirt_types.h

+0 −2
Original line number Diff line number Diff line
@@ -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,

arch/x86/kernel/paravirt.c

+1 −12
Original line number Diff line number Diff line
@@ -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)