From nobody Mon Apr 6 11:55:28 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13B89C6FA86 for ; Mon, 26 Sep 2022 14:19:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233645AbiIZOTS (ORCPT ); Mon, 26 Sep 2022 10:19:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233734AbiIZOSZ (ORCPT ); Mon, 26 Sep 2022 10:18:25 -0400 Received: from loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9B6EB188BF7 for ; Mon, 26 Sep 2022 05:28:08 -0700 (PDT) Received: from 4.cn (unknown [10.20.4.148]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Cx72uvmjFjbDkiAA--.59138S2; Mon, 26 Sep 2022 20:27:27 +0800 (CST) From: Jun Yi To: Huacai Chen , WANG Xuerui , Tiezhu Yang , Jiaxun Yang , Qing Zhang , Guo Ren , Mao Bibo , Jianmin Lv Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3] LoongArch: Fixup do_ri csr_era Date: Mon, 26 Sep 2022 20:27:27 +0800 Message-Id: <20220926122727.2310118-1-yijun@loongson.cn> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: AQAAf8Cx72uvmjFjbDkiAA--.59138S2 X-Coremail-Antispam: 1UD129KBjvdXoWrury7ZrykZrWxZryxJF17Awb_yoWxurg_A3 W29w1UWa1rAw4Syw1Uur4fGFyqvay8KF1Fk3Z2vrWkCFn8Jw4Yy3y5A3Z8ArnIgFWrGrs8 Z39rJrn0kFy8tjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbs8FF20E14v26r4j6ryUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8w A2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr0_ Cr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s 1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0 cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8Jw ACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2Y2ka 0xkIwI1lc2xSY4AK6svPMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI 8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AK xVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI 8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280 aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43 ZEXa7VUbXdbUUUUUU== X-CM-SenderInfo: p1lm30o6or00hjvr0hdfq/1tbiAQABAWMxll4ANgABss Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" csr_era of pt_regs in do_ri should not add 4 to point to the next instruction. Signed-off-by: Jun Yi --- arch/loongarch/kernel/traps.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/loongarch/kernel/traps.c b/arch/loongarch/kernel/traps.c index aa1c95aaf595..ec888eda3d45 100644 --- a/arch/loongarch/kernel/traps.c +++ b/arch/loongarch/kernel/traps.c @@ -477,8 +477,6 @@ asmlinkage void noinstr do_ri(struct pt_regs *regs) =20 die_if_kernel("Reserved instruction in kernel code", regs); =20 - compute_return_era(regs); - if (unlikely(get_user(opcode, era) < 0)) { status =3D SIGSEGV; current->thread.error_code =3D 1; --=20 2.31.1