Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8393c524 authored by Huacai Chen's avatar Huacai Chen Committed by Ralf Baechle
Browse files

MIPS: tlbex: Fix a missing statement for HUGETLB 



In commit 2c8c53e2 (MIPS: Optimize TLB handlers for Octeon CPUs)
build_r4000_tlb_refill_handler() is modified. But it doesn't compatible
with the original code in HUGETLB case. Because there is a copy & paste
error and one line of code is missing. It is very easy to produce a bug
with LTP's hugemmap05 test.

Signed-off-by: default avatarHuacai Chen <chenhc@lemote.com>
Signed-off-by: default avatarBinbin Zhou <zhoubb@lemote.com>
Cc: <stable@vger.kernel.org>
Cc: John Crispin <john@phrozen.org>
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/7496/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent f98fd44b

arch/mips/mm/tlbex.c

+1 −0
Original line number Diff line number Diff line
@@ -1299,6 +1299,7 @@ static void build_r4000_tlb_refill_handler(void) 
	}

#ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT

	uasm_l_tlb_huge_update(&l, p);

	UASM_i_LW(&p, K0, 0, K1);

	build_huge_update_entries(&p, htlb_info.huge_pte, K1);

	build_huge_tlb_write_entry(&p, &l, &r, K0, tlb_random,

				   htlb_info.restore_scratch);