From d8e6697dadc648c10713a2acea3bf846a864e74f Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Mon, 13 Jun 2005 20:12:01 +0000 Subject: [PATCH] --- yaml --- r: 11101 b: refs/heads/master c: d925c262dd8bee2202b0d1b85ce0b332f48dd34b h: refs/heads/master i: 11099: ebf9c6e411f71e88d96658fd83afd4535e018c7d v: v3 --- [refs] | 2 +- trunk/arch/mips/mm/tlbex.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 537f564075ec..2c56a5c985e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9678e28b1ab931c35567cb15927b8c5e474934c3 +refs/heads/master: d925c262dd8bee2202b0d1b85ce0b332f48dd34b diff --git a/trunk/arch/mips/mm/tlbex.c b/trunk/arch/mips/mm/tlbex.c index 2e90c1d2d053..68d24b80053b 100644 --- a/trunk/arch/mips/mm/tlbex.c +++ b/trunk/arch/mips/mm/tlbex.c @@ -1486,6 +1486,7 @@ static void __init build_r3000_tlb_load_handler(void) build_r3000_tlbchange_handler_head(&p, K0, K1); build_pte_present(&p, &l, &r, K0, K1, label_nopage_tlbl); + i_nop(&p); /* load delay */ build_make_valid(&p, &r, K0, K1); build_r3000_pte_reload(&p, K1); build_r3000_tlb_write(&p, &l, &r, K0); @@ -1527,6 +1528,7 @@ static void __init build_r3000_tlb_store_handler(void) build_r3000_tlbchange_handler_head(&p, K0, K1); build_pte_writable(&p, &l, &r, K0, K1, label_nopage_tlbs); + i_nop(&p); /* load delay */ build_make_write(&p, &r, K0, K1); build_r3000_pte_reload(&p, K1); build_r3000_tlb_write(&p, &l, &r, K0); @@ -1568,6 +1570,7 @@ static void __init build_r3000_tlb_modify_handler(void) build_r3000_tlbchange_handler_head(&p, K0, K1); build_pte_modifiable(&p, &l, &r, K0, K1, label_nopage_tlbm); + i_nop(&p); /* load delay */ build_make_write(&p, &r, K0, K1); build_r3000_pte_reload(&p, K1); i_tlbwi(&p);