Commit 31d85460 authored by Arvind Sankar's avatar Arvind Sankar Committed by Borislav Petkov
Browse files

x86/head/64: Remove unused GET_CR2_INTO() macro 



Commit

  4b47cdbd ("x86/head/64: Move early exception dispatch to C code")

removed the usage of GET_CR2_INTO().

Drop the definition as well, and related definitions in paravirt.h and
asm-offsets.h

Signed-off-by: default avatarArvind Sankar <nivedita@alum.mit.edu>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20201005151208.2212886-3-nivedita@alum.mit.edu
parent 0ac317e8

arch/x86/include/asm/paravirt.h

+0 −11
Original line number Diff line number Diff line
@@ -812,17 +812,6 @@ extern void default_banner(void); 
#endif /* CONFIG_PARAVIRT_XXL */

#endif	/* CONFIG_X86_64 */



#ifdef CONFIG_PARAVIRT_XXL



#define GET_CR2_INTO_AX							\

	PARA_SITE(PARA_PATCH(PV_MMU_read_cr2),				\

		  ANNOTATE_RETPOLINE_SAFE;				\

		  call PARA_INDIRECT(pv_ops+PV_MMU_read_cr2);		\

		 )



#endif /* CONFIG_PARAVIRT_XXL */





#endif /* __ASSEMBLY__ */

#else  /* CONFIG_PARAVIRT */

# define default_banner x86_init_noop

arch/x86/kernel/asm-offsets.c

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ static void __used 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_MMU_read_cr2, paravirt_patch_template, mmu.read_cr2);

#endif



#ifdef CONFIG_XEN

arch/x86/kernel/head_64.S

+0 −9
Original line number Diff line number Diff line
@@ -26,15 +26,6 @@ 
#include <asm/nospec-branch.h>

#include <asm/fixmap.h>



#ifdef CONFIG_PARAVIRT_XXL

#include <asm/asm-offsets.h>

#include <asm/paravirt.h>

#define GET_CR2_INTO(reg) GET_CR2_INTO_AX ; _ASM_MOV %_ASM_AX, reg

#else

#define INTERRUPT_RETURN iretq

#define GET_CR2_INTO(reg) _ASM_MOV %cr2, reg

#endif



/*

 * We are not able to switch in one step to the final KERNEL ADDRESS SPACE

 * because we need identity-mapped pages.