Commit 2f8f8c04 authored Jul 08, 2016 by James Hogan Committed by Ralf Baechle Jul 24, 2016

MIPS: tlbex: Avoid duplicated single_insn_swpd

The expression "uasm_in_compat_space_p(swpd) && !uasm_rel_lo(swpd)" is
used twice in build_get_pgd_vmalloc64(), one of which is assigned to the
local variable single_insn_swpd. Update the other use to just use
single_insn_swpd instead to remove the duplication.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/13779/

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent f7d9afea

arch/mips/mm/tlbex.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -888,7 +888,7 @@ build_get_pgd_vmalloc64(u32 p, struct uasm_label l, struct uasm_reloc **r,
		}
		}
		if (!did_vmalloc_branch) {
		if (uasm_in_compat_space_p(swpd) && !uasm_rel_lo(swpd)) {
		if (single_insn_swpd) {
		uasm_il_b(p, r, label_vmalloc_done);
		uasm_i_lui(p, ptr, uasm_rel_hi(swpd));
		} else {