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

Commit 676646ee authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Marcelo Tosatti
Browse files

KVM: MMU: remove unused macros 



These macros are not used, so removed

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 842f22ed

arch/x86/kvm/mmu.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -111,9 +111,6 @@ module_param(oos_shadow, bool, 0644); 
#define PT64_LEVEL_SHIFT(level) \

#define PT64_LEVEL_SHIFT(level) \

		(PAGE_SHIFT + (level - 1) * PT64_LEVEL_BITS)

		(PAGE_SHIFT + (level - 1) * PT64_LEVEL_BITS)





#define PT64_LEVEL_MASK(level) \

		(((1ULL << PT64_LEVEL_BITS) - 1) << PT64_LEVEL_SHIFT(level))



#define PT64_INDEX(address, level)\

#define PT64_INDEX(address, level)\

	(((address) >> PT64_LEVEL_SHIFT(level)) & ((1 << PT64_LEVEL_BITS) - 1))

	(((address) >> PT64_LEVEL_SHIFT(level)) & ((1 << PT64_LEVEL_BITS) - 1))
@@ -123,8 +120,6 @@ module_param(oos_shadow, bool, 0644); 
#define PT32_LEVEL_SHIFT(level) \

#define PT32_LEVEL_SHIFT(level) \

		(PAGE_SHIFT + (level - 1) * PT32_LEVEL_BITS)

		(PAGE_SHIFT + (level - 1) * PT32_LEVEL_BITS)





#define PT32_LEVEL_MASK(level) \

		(((1ULL << PT32_LEVEL_BITS) - 1) << PT32_LEVEL_SHIFT(level))

#define PT32_LVL_OFFSET_MASK(level) \

#define PT32_LVL_OFFSET_MASK(level) \

	(PT32_BASE_ADDR_MASK & ((1ULL << (PAGE_SHIFT + (((level) - 1) \

	(PT32_BASE_ADDR_MASK & ((1ULL << (PAGE_SHIFT + (((level) - 1) \

						* PT32_LEVEL_BITS))) - 1))

						* PT32_LEVEL_BITS))) - 1))

arch/x86/kvm/paging_tmpl.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ 
	#define PT_LVL_ADDR_MASK(lvl) PT64_LVL_ADDR_MASK(lvl)

	#define PT_LVL_ADDR_MASK(lvl) PT64_LVL_ADDR_MASK(lvl)

	#define PT_LVL_OFFSET_MASK(lvl) PT64_LVL_OFFSET_MASK(lvl)

	#define PT_LVL_OFFSET_MASK(lvl) PT64_LVL_OFFSET_MASK(lvl)

	#define PT_INDEX(addr, level) PT64_INDEX(addr, level)

	#define PT_INDEX(addr, level) PT64_INDEX(addr, level)

	#define PT_LEVEL_MASK(level) PT64_LEVEL_MASK(level)

	#define PT_LEVEL_BITS PT64_LEVEL_BITS

	#define PT_LEVEL_BITS PT64_LEVEL_BITS

	#ifdef CONFIG_X86_64

	#ifdef CONFIG_X86_64

	#define PT_MAX_FULL_LEVELS 4

	#define PT_MAX_FULL_LEVELS 4
@@ -48,7 +47,6 @@ 
	#define PT_LVL_ADDR_MASK(lvl) PT32_LVL_ADDR_MASK(lvl)

	#define PT_LVL_ADDR_MASK(lvl) PT32_LVL_ADDR_MASK(lvl)

	#define PT_LVL_OFFSET_MASK(lvl) PT32_LVL_OFFSET_MASK(lvl)

	#define PT_LVL_OFFSET_MASK(lvl) PT32_LVL_OFFSET_MASK(lvl)

	#define PT_INDEX(addr, level) PT32_INDEX(addr, level)

	#define PT_INDEX(addr, level) PT32_INDEX(addr, level)

	#define PT_LEVEL_MASK(level) PT32_LEVEL_MASK(level)

	#define PT_LEVEL_BITS PT32_LEVEL_BITS

	#define PT_LEVEL_BITS PT32_LEVEL_BITS

	#define PT_MAX_FULL_LEVELS 2

	#define PT_MAX_FULL_LEVELS 2

	#define CMPXCHG cmpxchg

	#define CMPXCHG cmpxchg
@@ -827,7 +825,6 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp) 
#undef FNAME

#undef FNAME

#undef PT_BASE_ADDR_MASK

#undef PT_BASE_ADDR_MASK

#undef PT_INDEX

#undef PT_INDEX

#undef PT_LEVEL_MASK

#undef PT_LVL_ADDR_MASK

#undef PT_LVL_ADDR_MASK

#undef PT_LVL_OFFSET_MASK

#undef PT_LVL_OFFSET_MASK

#undef PT_LEVEL_BITS

#undef PT_LEVEL_BITS