Hi Leonid, On 28/04/15 20:53, Leonid Yegoshin wrote: > Error recovery pointers for fixups was improperly set as ".word" > which is unsuitable for MIPS64. > > Replaced by __stringify(PTR)
Every other case of this sort of thing uses STR(PTR) (or __UA_ADDR in
uaccess.h). Can we stick to STR(PTR) for consistency please?
With that change made:
Reviewed-by: James Hogan <james.ho...@imgtec.com>
Please also add these tags:
Fixes: b0a668fb2038 ("MIPS: kernel: mips-r2-to-r6-emul: Add R2 emulator for
MIPS R6")
Cc: <sta...@vger.kernel.org> # 4.0+
Thanks
James
>
> Signed-off-by: Leonid Yegoshin <leonid.yegos...@imgtec.com>
> ---
> arch/mips/kernel/mips-r2-to-r6-emul.c | 104
> +++++++++++++++++----------------
> 1 file changed, 52 insertions(+), 52 deletions(-)
>
> diff --git a/arch/mips/kernel/mips-r2-to-r6-emul.c
> b/arch/mips/kernel/mips-r2-to-r6-emul.c
> index f2977f00911b..c6f079f8f3dc 100644
> --- a/arch/mips/kernel/mips-r2-to-r6-emul.c
> +++ b/arch/mips/kernel/mips-r2-to-r6-emul.c
> @@ -1250,10 +1250,10 @@ fpu_emul:
> " j 10b\n"
> " .previous\n"
> " .section __ex_table,\"a\"\n"
> - " .word 1b,8b\n"
> - " .word 2b,8b\n"
> - " .word 3b,8b\n"
> - " .word 4b,8b\n"
> + __stringify(PTR) " 1b,8b\n"
> + __stringify(PTR) " 2b,8b\n"
> + __stringify(PTR) " 3b,8b\n"
> + __stringify(PTR) " 4b,8b\n"
> " .previous\n"
> " .set pop\n"
> : "+&r"(rt), "=&r"(rs),
> @@ -1325,10 +1325,10 @@ fpu_emul:
> " j 10b\n"
> " .previous\n"
> " .section __ex_table,\"a\"\n"
> - " .word 1b,8b\n"
> - " .word 2b,8b\n"
> - " .word 3b,8b\n"
> - " .word 4b,8b\n"
> + __stringify(PTR) " 1b,8b\n"
> + __stringify(PTR) " 2b,8b\n"
> + __stringify(PTR) " 3b,8b\n"
> + __stringify(PTR) " 4b,8b\n"
> " .previous\n"
> " .set pop\n"
> : "+&r"(rt), "=&r"(rs),
> @@ -1396,10 +1396,10 @@ fpu_emul:
> " j 9b\n"
> " .previous\n"
> " .section __ex_table,\"a\"\n"
> - " .word 1b,8b\n"
> - " .word 2b,8b\n"
> - " .word 3b,8b\n"
> - " .word 4b,8b\n"
> + __stringify(PTR) " 1b,8b\n"
> + __stringify(PTR) " 2b,8b\n"
> + __stringify(PTR) " 3b,8b\n"
> + __stringify(PTR) " 4b,8b\n"
> " .previous\n"
> " .set pop\n"
> : "+&r"(rt), "=&r"(rs),
> @@ -1466,10 +1466,10 @@ fpu_emul:
> " j 9b\n"
> " .previous\n"
> " .section __ex_table,\"a\"\n"
> - " .word 1b,8b\n"
> - " .word 2b,8b\n"
> - " .word 3b,8b\n"
> - " .word 4b,8b\n"
> + __stringify(PTR) " 1b,8b\n"
> + __stringify(PTR) " 2b,8b\n"
> + __stringify(PTR) " 3b,8b\n"
> + __stringify(PTR) " 4b,8b\n"
> " .previous\n"
> " .set pop\n"
> : "+&r"(rt), "=&r"(rs),
> @@ -1581,14 +1581,14 @@ fpu_emul:
> " j 9b\n"
> " .previous\n"
> " .section __ex_table,\"a\"\n"
> - " .word 1b,8b\n"
> - " .word 2b,8b\n"
> - " .word 3b,8b\n"
> - " .word 4b,8b\n"
> - " .word 5b,8b\n"
> - " .word 6b,8b\n"
> - " .word 7b,8b\n"
> - " .word 0b,8b\n"
> + __stringify(PTR) " 1b,8b\n"
> + __stringify(PTR) " 2b,8b\n"
> + __stringify(PTR) " 3b,8b\n"
> + __stringify(PTR) " 4b,8b\n"
> + __stringify(PTR) " 5b,8b\n"
> + __stringify(PTR) " 6b,8b\n"
> + __stringify(PTR) " 7b,8b\n"
> + __stringify(PTR) " 0b,8b\n"
> " .previous\n"
> " .set pop\n"
> : "+&r"(rt), "=&r"(rs),
> @@ -1700,14 +1700,14 @@ fpu_emul:
> " j 9b\n"
> " .previous\n"
> " .section __ex_table,\"a\"\n"
> - " .word 1b,8b\n"
> - " .word 2b,8b\n"
> - " .word 3b,8b\n"
> - " .word 4b,8b\n"
> - " .word 5b,8b\n"
> - " .word 6b,8b\n"
> - " .word 7b,8b\n"
> - " .word 0b,8b\n"
> + __stringify(PTR) " 1b,8b\n"
> + __stringify(PTR) " 2b,8b\n"
> + __stringify(PTR) " 3b,8b\n"
> + __stringify(PTR) " 4b,8b\n"
> + __stringify(PTR) " 5b,8b\n"
> + __stringify(PTR) " 6b,8b\n"
> + __stringify(PTR) " 7b,8b\n"
> + __stringify(PTR) " 0b,8b\n"
> " .previous\n"
> " .set pop\n"
> : "+&r"(rt), "=&r"(rs),
> @@ -1819,14 +1819,14 @@ fpu_emul:
> " j 9b\n"
> " .previous\n"
> " .section __ex_table,\"a\"\n"
> - " .word 1b,8b\n"
> - " .word 2b,8b\n"
> - " .word 3b,8b\n"
> - " .word 4b,8b\n"
> - " .word 5b,8b\n"
> - " .word 6b,8b\n"
> - " .word 7b,8b\n"
> - " .word 0b,8b\n"
> + __stringify(PTR) " 1b,8b\n"
> + __stringify(PTR) " 2b,8b\n"
> + __stringify(PTR) " 3b,8b\n"
> + __stringify(PTR) " 4b,8b\n"
> + __stringify(PTR) " 5b,8b\n"
> + __stringify(PTR) " 6b,8b\n"
> + __stringify(PTR) " 7b,8b\n"
> + __stringify(PTR) " 0b,8b\n"
> " .previous\n"
> " .set pop\n"
> : "+&r"(rt), "=&r"(rs),
> @@ -1937,14 +1937,14 @@ fpu_emul:
> " j 9b\n"
> " .previous\n"
> " .section __ex_table,\"a\"\n"
> - " .word 1b,8b\n"
> - " .word 2b,8b\n"
> - " .word 3b,8b\n"
> - " .word 4b,8b\n"
> - " .word 5b,8b\n"
> - " .word 6b,8b\n"
> - " .word 7b,8b\n"
> - " .word 0b,8b\n"
> + __stringify(PTR) " 1b,8b\n"
> + __stringify(PTR) " 2b,8b\n"
> + __stringify(PTR) " 3b,8b\n"
> + __stringify(PTR) " 4b,8b\n"
> + __stringify(PTR) " 5b,8b\n"
> + __stringify(PTR) " 6b,8b\n"
> + __stringify(PTR) " 7b,8b\n"
> + __stringify(PTR) " 0b,8b\n"
> " .previous\n"
> " .set pop\n"
> : "+&r"(rt), "=&r"(rs),
> @@ -1999,7 +1999,7 @@ fpu_emul:
> "j 2b\n"
> ".previous\n"
> ".section __ex_table,\"a\"\n"
> - ".word 1b, 3b\n"
> + __stringify(PTR) " 1b,3b\n"
> ".previous\n"
> : "=&r"(res), "+&r"(err)
> : "r"(vaddr), "i"(SIGSEGV)
> @@ -2057,7 +2057,7 @@ fpu_emul:
> "j 2b\n"
> ".previous\n"
> ".section __ex_table,\"a\"\n"
> - ".word 1b, 3b\n"
> + __stringify(PTR) " 1b,3b\n"
> ".previous\n"
> : "+&r"(res), "+&r"(err)
> : "r"(vaddr), "i"(SIGSEGV));
> @@ -2118,7 +2118,7 @@ fpu_emul:
> "j 2b\n"
> ".previous\n"
> ".section __ex_table,\"a\"\n"
> - ".word 1b, 3b\n"
> + __stringify(PTR) " 1b,3b\n"
> ".previous\n"
> : "=&r"(res), "+&r"(err)
> : "r"(vaddr), "i"(SIGSEGV)
> @@ -2181,7 +2181,7 @@ fpu_emul:
> "j 2b\n"
> ".previous\n"
> ".section __ex_table,\"a\"\n"
> - ".word 1b, 3b\n"
> + __stringify(PTR) " 1b,3b\n"
> ".previous\n"
> : "+&r"(res), "+&r"(err)
> : "r"(vaddr), "i"(SIGSEGV));
>
>
signature.asc
Description: OpenPGP digital signature
