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

Commit dac39f78 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/64s: Remove overlaps_kvm_tmp() 



kvm_tmp is now in .text and so doesn't need a special overlap check.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20190911115746.12433-2-mpe@ellerman.id.au
parent 0cb0837f

arch/powerpc/include/asm/sections.h

+0 −11
Original line number Diff line number Diff line
@@ -61,17 +61,6 @@ static inline int overlaps_kernel_text(unsigned long start, unsigned long end) 
		(unsigned long)_stext < end;

}



static inline int overlaps_kvm_tmp(unsigned long start, unsigned long end)

{

#ifdef CONFIG_KVM_GUEST

	extern char kvm_tmp[];

	return start < (unsigned long)kvm_tmp &&

		(unsigned long)&kvm_tmp[1024 * 1024] < end;

#else

	return 0;

#endif

}



#ifdef PPC64_ELF_ABI_v1



#define HAVE_DEREFERENCE_FUNCTION_DESCRIPTOR 1

arch/powerpc/mm/book3s64/hash_utils.c

+0 −4
Original line number Diff line number Diff line
@@ -273,10 +273,6 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend, 
		if (overlaps_kernel_text(vaddr, vaddr + step))

			tprot &= ~HPTE_R_N;



		/* Make kvm guest trampolines executable */

		if (overlaps_kvm_tmp(vaddr, vaddr + step))

			tprot &= ~HPTE_R_N;



		/*

		 * If relocatable, check if it overlaps interrupt vectors that

		 * are copied down to real 0. For relocatable kernel