linux-mips
[Top] [All Lists]

[PATCH] MIPS: No branches in delay slots for huge pages in handle_tlbl

To: linux-mips@linux-mips.org, ralf@linux-mips.org
Subject: [PATCH] MIPS: No branches in delay slots for huge pages in handle_tlbl
From: David Daney <david.daney@cavium.com>
Date: Fri, 16 Sep 2011 18:06:02 -0700
Cc: David Daney <david.daney@cavium.com>
Sender: linux-mips-bounce@linux-mips.org
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


<Prev in Thread] Current Thread [Next in Thread>