From 83644706f5677d21641ed04b732c49ea4c1dcbb0 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 20 Dec 2012 12:47:51 +0100 Subject: [PATCH] --- yaml --- r: 348303 b: refs/heads/master c: 9120963578320532dfb3a9a7947e8d05b39900b5 h: refs/heads/master i: 348301: 9034dde67b7fea649d75b8a26f0a3bd47fcedb3e 348299: 8aaf70f59acfede6e4a59825eb7c21e5f5910622 348295: 191c49a6744523ca20d033e49b52d67768625793 348287: bd413513a0ea119d3e09d5510d2ca64837c71b83 v: v3 --- [refs] | 2 +- trunk/arch/mips/mm/tlbex.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 09008cadca9e..a413e5e88ebf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4457af67337112733b65a66c3d56ca5518e1adbb +refs/heads/master: 9120963578320532dfb3a9a7947e8d05b39900b5 diff --git a/trunk/arch/mips/mm/tlbex.c b/trunk/arch/mips/mm/tlbex.c index 05613355627b..1c8ac49ec72c 100644 --- a/trunk/arch/mips/mm/tlbex.c +++ b/trunk/arch/mips/mm/tlbex.c @@ -976,13 +976,6 @@ build_get_pgde32(u32 **p, unsigned int tmp, unsigned int ptr) #endif uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */ uasm_i_lw(p, ptr, uasm_rel_lo(pgdc), ptr); - - if (cpu_has_mips_r2) { - uasm_i_ext(p, tmp, tmp, PGDIR_SHIFT, (32 - PGDIR_SHIFT)); - uasm_i_ins(p, ptr, tmp, PGD_T_LOG2, (32 - PGDIR_SHIFT)); - return; - } - uasm_i_srl(p, tmp, tmp, PGDIR_SHIFT); /* get pgd only bits */ uasm_i_sll(p, tmp, tmp, PGD_T_LOG2); uasm_i_addu(p, ptr, ptr, tmp); /* add in pgd offset */ @@ -1018,15 +1011,6 @@ static void __cpuinit build_adjust_context(u32 **p, unsigned int ctx) static void __cpuinit build_get_ptep(u32 **p, unsigned int tmp, unsigned int ptr) { - if (cpu_has_mips_r2) { - /* PTE ptr offset is obtained from BadVAddr */ - UASM_i_MFC0(p, tmp, C0_BADVADDR); - UASM_i_LW(p, ptr, 0, ptr); - uasm_i_ext(p, tmp, tmp, PAGE_SHIFT+1, PGDIR_SHIFT-PAGE_SHIFT-1); - uasm_i_ins(p, ptr, tmp, PTE_T_LOG2+1, PGDIR_SHIFT-PAGE_SHIFT-1); - return; - } - /* * Bug workaround for the Nevada. It seems as if under certain * circumstances the move from cp0_context might produce a