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>

diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 4004b659ce50ef439c6782fb70b42c44c1ecd7eb..7886cce9ebe2569c11fc8564f6d79000ee5c0159 100644 (file)
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -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 {