Commit 5def7a4c authored by Juergen Gross's avatar Juergen Gross Committed by Thomas Gleixner
Browse files

x86/paravirt: Remove unused paravirt bits 



The macros ENABLE_INTERRUPTS_SYSEXIT, GET_CR0_INTO_EAX and
PARAVIRT_ADJUST_EXCEPTION_FRAME are used nowhere.

Remove their definitions.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: xen-devel@lists.xenproject.org
Cc: virtualization@lists.linux-foundation.org
Cc: akataria@vmware.com
Cc: rusty@rustcorp.com.au
Cc: boris.ostrovsky@oracle.com
Cc: hpa@zytor.com
Link: https://lkml.kernel.org/r/20180828074026.820-10-jgross@suse.com
parent 5c83511b

arch/x86/include/asm/irqflags.h

+0 −4
Original line number Diff line number Diff line
@@ -135,8 +135,6 @@ static inline notrace unsigned long arch_local_irq_save(void) 
 */

#define SWAPGS_UNSAFE_STACK	swapgs



#define PARAVIRT_ADJUST_EXCEPTION_FRAME	/*  */



#define INTERRUPT_RETURN	jmp native_iret

#define USERGS_SYSRET64				\

	swapgs;					\
@@ -150,8 +148,6 @@ static inline notrace unsigned long arch_local_irq_save(void) 
#endif

#else

#define INTERRUPT_RETURN		iret

#define ENABLE_INTERRUPTS_SYSEXIT	sti; sysexit

#define GET_CR0_INTO_EAX		movl %cr0, %eax

#endif

arch/x86/include/asm/paravirt.h

+1 −8
Original line number Diff line number Diff line
@@ -887,14 +887,7 @@ extern void default_banner(void); 
		  call PARA_INDIRECT(pv_ops+PV_IRQ_irq_enable);		\

		  PV_RESTORE_REGS(clobbers | CLBR_CALLEE_SAVE);)



#ifdef CONFIG_X86_32

#define GET_CR0_INTO_EAX				\

	push %ecx; push %edx;				\

	ANNOTATE_RETPOLINE_SAFE;				\

	call PARA_INDIRECT(pv_ops+PV_CPU_read_cr0);	\

	pop %edx; pop %ecx

#else	/* !CONFIG_X86_32 */



#ifdef CONFIG_X86_64

/*

 * If swapgs is used while the userspace stack is still current,

 * there's no way to call a pvop.  The PV replacement *must* be

arch/x86/kernel/asm-offsets.c

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ void common(void) { 
	OFFSET(PV_IRQ_irq_disable, paravirt_patch_template, irq.irq_disable);

	OFFSET(PV_IRQ_irq_enable, paravirt_patch_template, irq.irq_enable);

	OFFSET(PV_CPU_iret, paravirt_patch_template, cpu.iret);

	OFFSET(PV_CPU_read_cr0, paravirt_patch_template, cpu.read_cr0);

	OFFSET(PV_MMU_read_cr2, paravirt_patch_template, mmu.read_cr2);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE