Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422715AbbD2JSH (ORCPT ); Wed, 29 Apr 2015 05:18:07 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:35307 "EHLO imgpgp01.kl.imgtec.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1031635AbbD2JSB (ORCPT ); Wed, 29 Apr 2015 05:18:01 -0400 X-PGP-Universal: processed; by imgpgp01.kl.imgtec.org on Wed, 29 Apr 2015 10:17:59 +0100 Message-ID: <5540A1BF.7060408@imgtec.com> Date: Wed, 29 Apr 2015 10:17:51 +0100 From: James Hogan User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Leonid Yegoshin , , , , , Subject: Re: [PATCH] MIPS64: R6: R2 emulation bugfix References: <20150428195335.11229.4516.stgit@ubuntu-yegoshin> In-Reply-To: <20150428195335.11229.4516.stgit@ubuntu-yegoshin> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="jlhnoPVHrTmPgiB8jsF4kIC0QHldAfuCp" X-Originating-IP: [192.168.154.110] X-ESG-ENCRYPT-TAG: da4c5968 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7816 Lines: 260 --jlhnoPVHrTmPgiB8jsF4kIC0QHldAfuCp Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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. >=20 > 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 Please also add these tags: Fixes: b0a668fb2038 ("MIPS: kernel: mips-r2-to-r6-emul: Add R2 emulator f= or MIPS R6") Cc: # 4.0+ Thanks James >=20 > Signed-off-by: Leonid Yegoshin > --- > arch/mips/kernel/mips-r2-to-r6-emul.c | 104 +++++++++++++++++--------= -------- > 1 file changed, 52 insertions(+), 52 deletions(-) >=20 > diff --git a/arch/mips/kernel/mips-r2-to-r6-emul.c b/arch/mips/kernel/m= ips-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), "=3D&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), "=3D&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), "=3D&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), "=3D&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), "=3D&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), "=3D&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), "=3D&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), "=3D&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" > : "=3D&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" > : "=3D&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)); >=20 >=20 --jlhnoPVHrTmPgiB8jsF4kIC0QHldAfuCp Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVQKHGAAoJEGwLaZPeOHZ6oKcP/2oG1jZDKpGiKYd2aBQNDkuk XEU23dFuhYCMem7cWBJnBCVisizpNCapM9GhbAPmNO3ldT2MhW9QyXPyVc4RVMY8 SWJOwwLPasG//IofOCmvtZXt2S8NK4YDT5nMhu9Z8DwBxJ16PaTukWLCnJsr4yC3 TAqsudmRcJ/CCaxCi1ti+4T9rJRGeEod0xFPTgaHKY0bwDyWPdiX1UdLLSu6Tkuk ScyTqEQfYcFF+ego21on9FM5uvVKS7HhDgHhftr7HrYeMcX+TsSkHl8zYWq3dS/S sCJvFu4fhzE/5P4V16gfL7mjg9S/OK3XzsyHCwU2GSL3/0eF+h0crvnYtRpi8TMC p0Ch/e80KEw62SlE14hCE7xEkXYBq1OTU2ZEKGMis5AL6puicQMlqeR6LzVasSWV ROTWB0HvsCORp2Zk/MEJpsY3hvquUyQJtLHWqruKTNBBNZ+/jbm47x6nW/3LFhRT wydjW2PIMxJR2iC4GsnABoExb+309x0ISm0PmZH8rMdt8UTRzdytX94RrDzQ3Grc cmlhmR5TggoDkqcFPs4zbAZDpAN0/4axxLvBG7N9ZxGbVxBf+48JcrT6s9j6P0dC hDAglQ96UJVOwDrKIYXijZJrcTuFAtnhNnBSp2NJaq26K3kASPbMOge+wrtjtDIT MP6/9fFeJhpTJkVnkBYr =o65l -----END PGP SIGNATURE----- --jlhnoPVHrTmPgiB8jsF4kIC0QHldAfuCp-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/