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

Commit f7bec68d authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

arm/arm64: KVM: Prune unused #defines 



We can now remove a number of dead #defines, thanks to the trampoline
code being gone.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent e537ecd7

arch/arm/include/asm/kvm_mmu.h

+0 −9
Original line number Diff line number Diff line
@@ -26,17 +26,8 @@ 
 * We directly use the kernel VA for the HYP, as we can directly share

 * the mapping (HTTBR "covers" TTBR1).

 */

#define HYP_PAGE_OFFSET_MASK	UL(~0)

#define HYP_PAGE_OFFSET		PAGE_OFFSET

#define KERN_TO_HYP(kva)	(kva)



/*

 * Our virtual mapping for the boot-time MMU-enable code. Must be

 * shared across all the page-tables. Conveniently, we use the vectors

 * page, where no kernel data will ever be shared with HYP.

 */

#define TRAMPOLINE_VA		UL(CONFIG_VECTORS_BASE)



/*

 * KVM_MMU_CACHE_MIN_PAGES is the number of stage2 page table translation levels.

 */

arch/arm64/include/asm/kvm_mmu.h

+0 −10
Original line number Diff line number Diff line
@@ -72,16 +72,6 @@ 
#define HYP_PAGE_OFFSET_HIGH_MASK	((UL(1) << VA_BITS) - 1)

#define HYP_PAGE_OFFSET_LOW_MASK	((UL(1) << (VA_BITS - 1)) - 1)



/* Temporary compat define */

#define HYP_PAGE_OFFSET_MASK		HYP_PAGE_OFFSET_HIGH_MASK



/*

 * Our virtual mapping for the idmap-ed MMU-enable code. Must be

 * shared across all the page-tables. Conveniently, we use the last

 * possible page, where no kernel mapping will ever exist.

 */

#define TRAMPOLINE_VA		(HYP_PAGE_OFFSET_MASK & PAGE_MASK)



#ifdef __ASSEMBLY__



#include <asm/alternative.h>