On Mon, 4 Apr 2005, Greg Weeks wrote: > I'm getting a machine check on a malta 4kc when userland starts up. This was > built from a copy of the malta tree from Friday. Has anyone else ran into > this? This is being resolved -- please try this patch for now. Maciej diff -up --recursive --new-file linux-mips-2.6.11-rc2-20050202.macro/arch/mips/mm/tlbex.c linux-mips-2.6.11-rc2-20050202/arch/mips/mm/tlbex.c --- linux-mips-2.6.11-rc2-20050202.macro/arch/mips/mm/tlbex.c 2005-01-13 19:15:04.000000000 +0000 +++ linux-mips-2.6.11-rc2-20050202/arch/mips/mm/tlbex.c 2005-02-05 01:35:00.000000000 +0000 @@ -1621,7 +1620,6 @@ build_r4000_tlbchange_handler_head(u32 * l_smp_pgtable_change(l, *p); # endif iPTE_LW(p, l, pte, 0, ptr); /* get even pte */ - build_tlb_probe_entry(p); } static void __init @@ -1662,6 +1660,7 @@ static void __init build_r4000_tlb_load_ build_r4000_tlbchange_handler_head(&p, &l, &r, K0, K1); build_pte_present(&p, &l, &r, K0, K1, label_nopage_tlbl); + build_tlb_probe_entry(&p); build_make_valid(&p, &r, K0, K1); build_r4000_tlbchange_handler_tail(&p, &l, &r, K0, K1); @@ -1701,6 +1700,7 @@ static void __init build_r4000_tlb_store build_r4000_tlbchange_handler_head(&p, &l, &r, K0, K1); build_pte_writable(&p, &l, &r, K0, K1, label_nopage_tlbs); + build_tlb_probe_entry(&p); build_make_write(&p, &r, K0, K1); build_r4000_tlbchange_handler_tail(&p, &l, &r, K0, K1); @@ -1740,6 +1740,7 @@ static void __init build_r4000_tlb_modif build_r4000_tlbchange_handler_head(&p, &l, &r, K0, K1); build_pte_modifiable(&p, &l, &r, K0, K1, label_nopage_tlbm); + build_tlb_probe_entry(&p); /* Present and writable bits set, set accessed and dirty bits. */ build_make_write(&p, &r, K0, K1); build_r4000_tlbchange_handler_tail(&p, &l, &r, K0, K1);
