Skip to contentSkip to conversation

MIPS: tlbex: Fix typo in r3000 tlb store handler

PATCH New Tony Wu 1 participant 2 messages Jul 18, 2013 MIPS

lore
Share & tools
lore

Tony Wu

author
#0 lore raw

PATCH v2 1/2 MIPS: tlbex: Fix typo in r3000 tlb store handler

commit 6ba045f (MIPS: Move generated code to .text for microMIPS) causes a panic at boot. The handler builder should test against handle_tlbs_end, not handle_tlbs.

---
 arch/mips/mm/tlbex.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/mm/tlbex.c +1 -1
index 9ab0f90..605b6fc 100644
@@ -1803,7 +1803,7 @@ static void __cpuinit build_r3000_tlb_store_handler(void)
 	uasm_i_j(&p, (unsigned long)tlb_do_page_fault_1 & 0x0fffffff);
 	uasm_i_nop(&p);
 
-	if (p >= handle_tlbs)
+	if (p >= handle_tlbs_end)
 		panic("TLB store handler fastpath space exceeded");
 
 	uasm_resolve_relocs(relocs, labels);
Signature · 1 line
1.7.10.2
author
#1 lore raw

PATCH v2 2/2 MIPS: tlbex: Guard tlbmiss_handler_setup_pgd

tlbmiss_handler_setup_pgd* are only referenced when CONFIG_MIPS_PGD_C0_CONTEXT is defined.

Cc Jayachandran C <[email protected]>
---
 arch/mips/mm/tlb-funcs.S |    2 ++
 1 file changed, 2 insertions(+)
arch/mips/mm/tlb-funcs.S +2 -0
index 30a494d..79bca31 100644
@@ -16,10 +16,12 @@
 
 #define FASTPATH_SIZE	128
 
+#ifdef CONFIG_MIPS_PGD_C0_CONTEXT
 LEAF(tlbmiss_handler_setup_pgd)
 	.space		16 * 4
 END(tlbmiss_handler_setup_pgd)
 EXPORT(tlbmiss_handler_setup_pgd_end)
+#endif
 
 LEAF(handle_tlbm)
 	.space		FASTPATH_SIZE * 4
Signature · 1 line
1.7.10.2