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

Unverified Commit 54e8d9f0 authored by Paul Burton's avatar Paul Burton
Browse files

MIPS: tlbex: Simplify r3k check 



We already know whether a CPU has r3k style exceptions, including TLB
exceptions, by checking cpu_has_3kex. Remove the list of CPU types in
build_tlb_refill_handler() & check cpu_has_3kex instead.

Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
parent 54746829

arch/mips/mm/tlbex.c

+22 −30
Original line number Diff line number Diff line
@@ -2607,14 +2607,7 @@ void build_tlb_refill_handler(void) 
	check_for_high_segbits = current_cpu_data.vmbits > (PGDIR_SHIFT + PGD_ORDER + PAGE_SHIFT - 3);

#endif



	switch (current_cpu_type()) {

	case CPU_R2000:

	case CPU_R3000:

	case CPU_R3000A:

	case CPU_R3081E:

	case CPU_TX3912:

	case CPU_TX3922:

	case CPU_TX3927:

	if (cpu_has_3kex) {

#ifndef CONFIG_MIPS_PGD_C0_CONTEXT

		if (cpu_has_local_ebase)

			build_r3000_tlb_refill_handler();
@@ -2631,9 +2624,9 @@ void build_tlb_refill_handler(void) 
#else

		panic("No R3000 TLB refill handler");

#endif

		break;

		return;

	}



	default:

	if (cpu_has_ldpte)

		setup_pw();
@@ -2657,4 +2650,3 @@ void build_tlb_refill_handler(void) 
	if (cpu_has_htw)

		config_htw_params();

}
 
}