diff --git a/[refs] b/[refs] index 91b623790008..4f8f14997af3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0349337467dc6039dcfb225074944ae944e7b34e +refs/heads/master: 1c6b2ca5e0939bf8b5d1a11f1646f25189ecd447 diff --git a/trunk/arch/sh/mm/fault.c b/trunk/arch/sh/mm/fault.c index f33cedb353fc..c56a5fabcd0f 100644 --- a/trunk/arch/sh/mm/fault.c +++ b/trunk/arch/sh/mm/fault.c @@ -304,14 +304,6 @@ asmlinkage int __kprobes __do_page_fault(struct pt_regs *regs, entry = pte_mkdirty(entry); entry = pte_mkyoung(entry); -#ifdef CONFIG_CPU_SH4 - /* - * ITLB is not affected by "ldtlb" instruction. - * So, we need to flush the entry by ourselves. - */ - local_flush_tlb_one(get_asid(), address & PAGE_MASK); -#endif - set_pte(pte, entry); update_mmu_cache(NULL, address, entry); ret = 0;