diff options
| author | James Hogan <james.hogan@imgtec.com> | 2016-07-08 14:05:56 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2016-07-24 13:16:00 +0200 |
| commit | 2f8f8c04e8c72b38a0ecdd814b02c0fddc42b932 (patch) | |
| tree | 5e7b75ae6f6c8cec75b0f748c86c29d9340c3717 /arch/mips | |
| parent | f7d9afea6cfb344021359ddd6101deb8f6e9cc76 (diff) | |
| download | linux-stable-2f8f8c04e8c72b38a0ecdd814b02c0fddc42b932.tar.gz linux-stable-2f8f8c04e8c72b38a0ecdd814b02c0fddc42b932.tar.bz2 linux-stable-2f8f8c04e8c72b38a0ecdd814b02c0fddc42b932.zip | |
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>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/mm/tlbex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 4004b659ce50..7886cce9ebe2 100644 --- 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 { |