From patchwork Mon Mar 27 16:22:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 9647157 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D3826602D6 for ; Mon, 27 Mar 2017 16:23:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C474828334 for ; Mon, 27 Mar 2017 16:23:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8F5828375; Mon, 27 Mar 2017 16:23:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB9BA28334 for ; Mon, 27 Mar 2017 16:23:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752020AbdC0QXW (ORCPT ); Mon, 27 Mar 2017 12:23:22 -0400 Received: from mout.gmx.net ([212.227.17.22]:59081 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751917AbdC0QXW (ORCPT ); Mon, 27 Mar 2017 12:23:22 -0400 Received: from p100.box ([193.159.30.136]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0M2nfO-1c3azO17JO-00sfpC; Mon, 27 Mar 2017 18:22:40 +0200 Date: Mon, 27 Mar 2017 18:22:37 +0200 From: Helge Deller To: linux-parisc@vger.kernel.org, James Bottomley , John David Anglin Subject: [PATCH] parisc: Inline trivial exception code Message-ID: <20170327162237.GA15335@p100.box> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Provags-ID: V03:K0:xYQX3R1cc1VGRamnAQaAoU2OuCIAOgNtlOawrGuIe3/u8CnJp3Z 2dBg8+bJQGltG6SZ/eVJTLIt6dUREn6rY6RRpoL2diL6+ptyPcEsPfVXX7eRRsGONomL7aF qXcIyjQjRhKgOKZo6mzT/R4mF43P8YbANHiUAbfEHjsKta7zr+hS5RAZ0WU8gKSQGR1CUhc 6v5VgYYsS8fGaU/KniUfQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:ciVDaGl1WGo=:xXXyTZBWnqnxU80ur/lpIY EiMWsnvJ554SeGz2RNRvoFGw+B7RMKY+E1N/IYqZ15J1Z6fWhYRrobc3Fp7710akMC7O7J30I 1ppZ5+xR0g+WZxsiCgP4ZSBjbTRNHGYYsiO5HW+aTEpiD3xSnv/Ip5SiHg2YK8TXBfIZJumZ+ BHw/1y6jGdvX/KYJmg65zZKL9EYYecznMvku/30dZ7KncQxStrCOjiSxOn22ERzp7FNGztORk m9yFWOTpbBCZibR3kLCxcUVIQ9rLtaeIggljEHcztB7VQFXWRiGkupJxtmHspKT6xgky7BIpQ v2Xt4FYWdqGUU8eqhRG6IpGQPPl7p7qHf/wHt/Rm5iD04iBjCh6gHD1WlkKY0T2nLhjiCsHqa EVP/jn5HBwq7j4gWPhw1qx+ga0dCMhwNTijBMSPUDK2tutX7MOXQo8eyCcGw/y7GSOGSdIeoQ QmnP/DZb67NdYxtbwI0yUmlXON1jC47SytK3sjMySmbRlVznKZB8E7fXCtEwsjhfyFnNmld3I q1QhPxt4ij2KI1LdtO0SjSfh4EGGZY5J4KY50UZZHlOXfvWgRc8cobNeADL4ismGlU4UGu0dc IRgesj9Fu7psWXq0lmFsePZZCq36Fc5sj+b6JjQR76bt0mbmoXhiYvJ+7Bp7Dm1mLPeyBkwaN sLGA4cMkFkSnDUShiXabL24hl9/GI6ymVbZ1asxRg5gVyHPSXfqI4DwdKN8C1nCW1Aa8AQRv5 HbsFj7G7mfmZlSoW0vmxTClXy45DGscDMAV6PFqc/peB5x2ccr3nBNlt9lM= Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fold trivial exception handling for lclear_user() and lstrnlen_user() into the main functions. Signed-off-by: Helge Deller --- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/parisc/lib/lusercopy.S b/arch/parisc/lib/lusercopy.S index 8bcff05..4718eca 100644 --- a/arch/parisc/lib/lusercopy.S +++ b/arch/parisc/lib/lusercopy.S @@ -55,12 +55,6 @@ mtsp %r1,%sr1 .endm - .macro fixup_branch lbl - ldil L%\lbl, %r1 - ldo R%\lbl(%r1), %r1 - bv %r0(%r1) - .endm - /* * unsigned long lclear_user(void *to, unsigned long n) * @@ -81,16 +75,16 @@ $lclu_loop: $lclu_done: bv %r0(%r2) copy %r25,%r28 - .exit -ENDPROC_CFI(lclear_user) - .section .fixup,"ax" -2: fixup_branch $lclu_done - ldo 1(%r25),%r25 - .previous +2: b $lclu_done + ldo 1(%r25),%r25 ASM_EXCEPTIONTABLE_ENTRY(1b,2b) + .exit +ENDPROC_CFI(lclear_user) + + .procend /* @@ -121,16 +115,15 @@ $lslen_done: $lslen_nzero: b $lslen_done ldo 1(%r26),%r26 /* special case for N == 0 */ -ENDPROC_CFI(lstrnlen_user) - .section .fixup,"ax" -3: fixup_branch $lslen_done +3: b $lslen_done copy %r24,%r26 /* reset r26 so 0 is returned on fault */ - .previous ASM_EXCEPTIONTABLE_ENTRY(1b,3b) ASM_EXCEPTIONTABLE_ENTRY(2b,3b) +ENDPROC_CFI(lstrnlen_user) + .procend