* [PATCH] MIPS: No branches in delay slots for huge pages in handle_tlbl
@ 2011-09-17 1:06 David Daney
2011-09-19 0:31 ` Ralf Baechle
0 siblings, 1 reply; 2+ messages in thread
From: David Daney @ 2011-09-17 1:06 UTC (permalink / raw)
To: linux-mips, ralf; +Cc: David Daney
For the case PM_DEFAULT_MASK == 0, we were placing a branch in the
delay slot of another branch. This leads to undefined behavior.
Signed-off-by: David Daney <david.daney@cavium.com>
---
arch/mips/mm/tlbex.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 46f33c7..e06370f 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -1962,7 +1962,8 @@ static void __cpuinit build_r4000_tlb_load_handler(void)
uasm_i_andi(&p, wr.r3, wr.r3, 2);
uasm_il_beqz(&p, &r, wr.r3, label_tlbl_goaround2);
}
-
+ if (PM_DEFAULT_MASK == 0)
+ uasm_i_nop(&p);
/*
* We clobbered C0_PAGEMASK, restore it. On the other branch
* it is restored in build_huge_tlb_write_entry.
--
1.7.2.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] MIPS: No branches in delay slots for huge pages in handle_tlbl
2011-09-17 1:06 [PATCH] MIPS: No branches in delay slots for huge pages in handle_tlbl David Daney
@ 2011-09-19 0:31 ` Ralf Baechle
0 siblings, 0 replies; 2+ messages in thread
From: Ralf Baechle @ 2011-09-19 0:31 UTC (permalink / raw)
To: David Daney; +Cc: linux-mips
Thanks, applied.
Ralf
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-19 9:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-17 1:06 [PATCH] MIPS: No branches in delay slots for huge pages in handle_tlbl David Daney
2011-09-19 0:31 ` Ralf Baechle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.