From patchwork Mon Aug 14 09:27:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiezhu Yang X-Patchwork-Id: 135300 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp2637363vqi; Mon, 14 Aug 2023 03:06:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEd+rB5dxGcKneW1vJQzVaMRczBwv/9lFhwPR97pyNBMvZYWr16wfYeM5N03nOnuGqKYQSB X-Received: by 2002:a17:906:cc2:b0:99b:e7d2:c2ad with SMTP id l2-20020a1709060cc200b0099be7d2c2admr7940863ejh.42.1692007560856; Mon, 14 Aug 2023 03:06:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692007560; cv=none; d=google.com; s=arc-20160816; b=x3v3j8mtcXFIUJkxQ7TvXIg1Ztg/AJvRom/CpFkFknKj1RobylyAoFm6sk2JxMmern KFxbfgg8mfmFL/QDGatIgZUDm15Xe+/0sh9DolP3Sds5IXifDeW4mY9fkUZol1dbjsYw FI6JU0FtagA0HEW8qBYOWVsjEAgxtmOLUf6Wcg31G+EHqaNpCwoyOSnkiX/ydhQJxYMU OG6P+ODnUKFOTqTNrMBXMKMaTLQTUr3m2y1sZSqyNJv5w6YoI+078G1hqS79M020iuSh zDhzYvVlreC5iy8zyslqKUq1dsv1KvdC2mQCWOnkLeifrM3i6cdH24vA1r2HNlKTFGzC rV3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=lXpm8AXbVWozm7xQRAVh5jd5yH2V3vc6jYJSgt3BaNc=; fh=zoicnZrSUumwSLub61Q/qA0LDg7Zj98grk3RszA4Weg=; b=zbDPheIPvriLl8MFTnK2KaZIRaybCSi7p2izFhXScPgX/+q15JHjXdjL7YwOzu08zs osTX0wl1w0eBR0QbCHisly75w2ogbVi9O5SZ2mhDIYUJqAqt4grkF5KMKLINL3b457Ep 9Y9iBm6ePFDuKqkWaU2WOtJf/ShRbxY9XsrPIYIX0wkuWCuulGWC9i+JAlFfS40VGHoH UskTUpevuGqDz1W8IMrTl/W931U9OPs0D9iND2sFmppe7dDijnXYY1YaroDdVPjYG0kl Wo0wPs4Rq7CZj4Ng32opzWb3J5nIXL8g9XxjS31aHETbwr1jxnmybDzUzguRppQ5hIkC wjvA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t7-20020a170906948700b0099bce5d5f77si7427722ejx.502.2023.08.14.03.05.36; Mon, 14 Aug 2023 03:06:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235876AbjHNJ2q (ORCPT + 99 others); Mon, 14 Aug 2023 05:28:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235643AbjHNJ2K (ORCPT ); Mon, 14 Aug 2023 05:28:10 -0400 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6FFA810C1; Mon, 14 Aug 2023 02:27:55 -0700 (PDT) Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8Bxd+iG89lkoxQYAA--.13710S3; Mon, 14 Aug 2023 17:27:34 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Bx3yOE89lkSLlZAA--.49910S3; Mon, 14 Aug 2023 17:27:33 +0800 (CST) From: Tiezhu Yang To: Thomas Bogendoerfer Cc: "Maciej W. Rozycki" , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, loongson-kernel@lists.loongnix.cn Subject: [PATCH v3 1/3] MIPS: Remove noreturn attribute for nmi_exception_handler() Date: Mon, 14 Aug 2023 17:27:24 +0800 Message-Id: <1692005246-18399-2-git-send-email-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1692005246-18399-1-git-send-email-yangtiezhu@loongson.cn> References: <1692005246-18399-1-git-send-email-yangtiezhu@loongson.cn> X-CM-TRANSID: AQAAf8Bx3yOE89lkSLlZAA--.49910S3 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj9xXoW7JryrKF4DXw4xWw17XF48KrX_yoWDArbE9F 1Ivw1xWrnYyrySkr1UuayDWFy3X3y7WF42ka1qqrZxK3Z8GayDG3y0vrnxXr1kXrW0yrZ8 Xry5KrZ7Way3CosvyTuYvTs0mTUanT9S1TB71UUUUUJqnTZGkaVYY2UrUUUUj1kv1TuYvT s0mT0YCTnIWjqI5I8CrVACY4xI64kE6c02F40Ex7xfYxn0WfASr-VFAUDa7-sFnT9fnUUI cSsGvfJTRUUUb3AYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I6I8E6xAIw20EY4v20x vaj40_Wr0E3s1l1IIY67AEw4v_JF0_JFyl8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVWUCVW8JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV WUJVW8JwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6r4UJVWxJr1ln4kS14v26r1Y6r17M2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12 xvs2x26I8E6xACxx1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r12 6r1DMcIj6I8E87Iv67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64 vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1l4IxYO2xFxVAFwI0_ Jrv_JF1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1V AY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAI cVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42 IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIev Ja73UjIFyTuYvjxUcCztUUUUU X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774198520242011339 X-GMAIL-MSGID: 1774198520242011339 In the later patch, we will remove noreturn attribute for die(), in order to make each patch can be built without errors and warnings, just remove noreturn attribute for nmi_exception_handler() earlier because it calls die(), otherwise there exists the following build error after the later patch: arch/mips/kernel/traps.c:2001:1: error: 'noreturn' function does return [-Werror] Signed-off-by: Tiezhu Yang --- arch/mips/kernel/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 246c6a6..7a34674 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c @@ -1986,7 +1986,7 @@ int register_nmi_notifier(struct notifier_block *nb) return raw_notifier_chain_register(&nmi_chain, nb); } -void __noreturn nmi_exception_handler(struct pt_regs *regs) +void nmi_exception_handler(struct pt_regs *regs) { char str[100]; From patchwork Mon Aug 14 09:27:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiezhu Yang X-Patchwork-Id: 135298 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp2636190vqi; Mon, 14 Aug 2023 03:03:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHuY5/oCaPnWSSJmVuk+lT+7p2msybTe5prCD1sGhrmU1TIioO/evs8gmbxlszEQvVN8fF2 X-Received: by 2002:a2e:9198:0:b0:2b7:65:fca2 with SMTP id f24-20020a2e9198000000b002b70065fca2mr6264618ljg.49.1692007427925; Mon, 14 Aug 2023 03:03:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692007427; cv=none; d=google.com; s=arc-20160816; b=q/8mAqZ56SGLGVg6/hYTthFV8jnD1aTf/We2nRe1+JQ9RXLnTDvnPuLwkuBBGmYS+r oAgaBqwGW+C/quxdwZ1Qacdnbkj9I+dsOGyF06UeLi1nSinYRVDYPF/YRNH8jNnJ8RN3 f5FKUyfUto2NNX96otEKpUfBO/bGAx5kPzFvua0WkAsK25ZeQ2PlEQm/vMYZOVUGtKhC 8v0Rmyfdn+PVbIPJ/G1rr6OHktDS0AZMAxhlbOgWbXfBNTlGX+VWVO2SHMtgUOZ/S98R NPhanzvD91ypv4G9DwDB+RNt0RADIAz+sI2kmMIZeUaZdvtTHUU089PjV3BDDqs6G8MJ /0Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=0C7nMBn96nx+0s4Um4rkUyTTLSztyT50mmllFrDxjuc=; fh=zoicnZrSUumwSLub61Q/qA0LDg7Zj98grk3RszA4Weg=; b=rk2vTlIDMTenNXAJp4FiDEACCIbM2lzVanA6Av4BmygFU4t4rIf4T9dN93tJiyNN+D GY8gPBiVA4Iuxq5KlplsUW8XiVXmaP8MyBnlvuCNdG4uJUzofqwwnpuVQHJ8mbF11PZW 09vrXmvWmFoCM+yAzxnn61WOIMxHdpU0M9H6zsVqn+zZ/vHKYmqG6UjmO/0aqkk/4pto SJRncrPmxD6un7ZJKAwgxajBY/kU6ZWlZwuqSDphlWmC1RNqwitZA5DIm3D8mJMCKr+s KulncdqWE03IdmJR/72J71zBKnzqZ3dHSzP4/Lia9jeiI3/0ytEIEA2WINXGJa1YR7N0 r28w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n9-20020a170906840900b0099279210464si7418082ejx.420.2023.08.14.03.03.23; Mon, 14 Aug 2023 03:03:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235788AbjHNJ2n (ORCPT + 99 others); Mon, 14 Aug 2023 05:28:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235527AbjHNJ2K (ORCPT ); Mon, 14 Aug 2023 05:28:10 -0400 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 702A610DB; Mon, 14 Aug 2023 02:27:55 -0700 (PDT) Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8CxbeuH89lkpxQYAA--.47460S3; Mon, 14 Aug 2023 17:27:35 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Bx3yOE89lkSLlZAA--.49910S4; Mon, 14 Aug 2023 17:27:34 +0800 (CST) From: Tiezhu Yang To: Thomas Bogendoerfer Cc: "Maciej W. Rozycki" , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, loongson-kernel@lists.loongnix.cn Subject: [PATCH v3 2/3] MIPS: Remove noreturn attribute for die() Date: Mon, 14 Aug 2023 17:27:25 +0800 Message-Id: <1692005246-18399-3-git-send-email-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1692005246-18399-1-git-send-email-yangtiezhu@loongson.cn> References: <1692005246-18399-1-git-send-email-yangtiezhu@loongson.cn> X-CM-TRANSID: AQAAf8Bx3yOE89lkSLlZAA--.49910S4 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj93XoWxXry8KF4kZry5XrW3try7Jwc_yoW5Jw4xpa 1qkasrGrWDCF4kXFyDAF4DCrW5JrZ5t3y2kw10kw4F93ZIv34rXrs7GFWjvw4rtr9Yga4U WFWYqr1FyFZ7AFcCm3ZEXasCq-sJn29KB7ZKAUJUUUUr529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUU9Ib4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2kKe7AKxVWUXVWUAwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07 AIYIkI8VC2zVCFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWU tVWrXwAv7VC2z280aVAFwI0_Cr0_Gr1UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x 0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwCFI7km07C267AK xVWUXVWUAwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67 AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI 42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMI IF0xvEx4A2jsIE14v26F4j6r4UJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnI WIevJa73UjIFyTuYvjxU2na9DUUUU X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774198380415833170 X-GMAIL-MSGID: 1774198380415833170 If notify_die() returns NOTIFY_STOP, honor the return value from the handler chain invocation in die() as, through a debugger, the fault may have been fixed. It makes sense even if ignoring the event will make the system unstable, by allowing access through a debugger it has been compromised already anyway. So we can remove the noreturn attribute for die() to make our port consistent with x86, arm64, riscv and csky. Commit 20c0d2d44029 ("[PATCH] i386: pass proper trap numbers to die chain handlers") may be the earliest of similar changes. Link: https://lore.kernel.org/all/alpine.DEB.2.21.2308132148500.8596@angie.orcam.me.uk/ Signed-off-by: Tiezhu Yang --- arch/mips/include/asm/ptrace.h | 2 +- arch/mips/kernel/traps.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h index daf3cf2..aee8e0a 100644 --- a/arch/mips/include/asm/ptrace.h +++ b/arch/mips/include/asm/ptrace.h @@ -159,7 +159,7 @@ static inline long regs_return_value(struct pt_regs *regs) extern asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall); extern asmlinkage void syscall_trace_leave(struct pt_regs *regs); -extern void die(const char *, struct pt_regs *) __noreturn; +extern void die(const char *, struct pt_regs *); static inline void die_if_kernel(const char *str, struct pt_regs *regs) { diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 7a34674..4f5140f 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c @@ -391,16 +391,15 @@ void show_registers(struct pt_regs *regs) static DEFINE_RAW_SPINLOCK(die_lock); -void __noreturn die(const char *str, struct pt_regs *regs) +void die(const char *str, struct pt_regs *regs) { static int die_counter; - int sig = SIGSEGV; + int ret; oops_enter(); - if (notify_die(DIE_OOPS, str, regs, 0, current->thread.trap_nr, - SIGSEGV) == NOTIFY_STOP) - sig = 0; + ret = notify_die(DIE_OOPS, str, regs, 0, + current->thread.trap_nr, SIGSEGV); console_verbose(); raw_spin_lock_irq(&die_lock); @@ -422,7 +421,8 @@ void __noreturn die(const char *str, struct pt_regs *regs) if (regs && kexec_should_crash(current)) crash_kexec(regs); - make_task_dead(sig); + if (ret != NOTIFY_STOP) + make_task_dead(SIGSEGV); } extern struct exception_table_entry __start___dbe_table[]; From patchwork Mon Aug 14 09:27:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiezhu Yang X-Patchwork-Id: 135299 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp2636496vqi; Mon, 14 Aug 2023 03:04:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH1JE5I0PH+Lg3DIQ36b34aNAfQWaYq8OosZwTpvgUEhCCJ91qUFG+F/Ku3msTp4e72aZoQ X-Received: by 2002:a05:6402:50a:b0:523:38ea:48bb with SMTP id m10-20020a056402050a00b0052338ea48bbmr7364490edv.24.1692007462121; Mon, 14 Aug 2023 03:04:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692007462; cv=none; d=google.com; s=arc-20160816; b=dpAWHvSBRBvE9ltWvR0fbc5f38ng4XOYgF+j0tk7xkCWiiMwcBOmo9xGTkEImxGH25 hYT86OmxDIiPASrvmecL5MXrXhMfhurTZnNE6ylXrk/yAAwfqf1bj4dIj/MctZ4rs2CI xts4vPJMzisu0lDRAnftLcD4OqC0fqnLUXu9Ar1OoVE8pBTQF2b1aS6SBdZmEjE1Ov7B FGDtXWOZ2cMAIPmWDmEoDMc4H+awGgQAYmvG0iHYdZeFTepcUKSHR2DHMPYxK93I9MEM MghzYtKeHODUPsom0KZY/P9Wa++6ptf+oX5tvpxcHRpwvLvrFAOEUdpa4GcfgSFFwOZK PRdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=X4djolbpE13ec7johjMBnwEizJH/yWs2de4AaKqwL8Y=; fh=zoicnZrSUumwSLub61Q/qA0LDg7Zj98grk3RszA4Weg=; b=RxHlOFiUdIlm93RlwJEfbS194EEtcUlbKpMUZslOLoG7UNvHNQqFCO+dgNt+7njU5F pldctAwjou7I6LUCHDlrjhrJk76GvioUiOvEDRW31yHCxbhtyy/RJMGor0zOBjPCB51G aV58QWwRrWdA78LMlN8YK2GcIPBONi+7E/uVdvHSfcQAPn4QpGuiePlPAfgjiC64Ta25 7n/EwEbTVcjBH2kO2klbZ1lpPzW1wLkzA73/NZQ9bacTvvOV5vF0YjZnDqHFpRWXOCn4 c+JGbJdnLsZJSJbwemzEbyI8SeNwjCIl6gblhmebn4doMiCeZ1/7eLARmvmclcqrowe2 xEUg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p22-20020aa7d316000000b00523718220f8si7186781edq.307.2023.08.14.03.03.58; Mon, 14 Aug 2023 03:04:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235829AbjHNJ2o (ORCPT + 99 others); Mon, 14 Aug 2023 05:28:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235687AbjHNJ2K (ORCPT ); Mon, 14 Aug 2023 05:28:10 -0400 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C936E10E5; Mon, 14 Aug 2023 02:27:55 -0700 (PDT) Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8AxFvGI89lkqxQYAA--.49519S3; Mon, 14 Aug 2023 17:27:36 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Bx3yOE89lkSLlZAA--.49910S5; Mon, 14 Aug 2023 17:27:35 +0800 (CST) From: Tiezhu Yang To: Thomas Bogendoerfer Cc: "Maciej W. Rozycki" , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, loongson-kernel@lists.loongnix.cn Subject: [PATCH v3 3/3] MIPS: Modify the declaration for die() Date: Mon, 14 Aug 2023 17:27:26 +0800 Message-Id: <1692005246-18399-4-git-send-email-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1692005246-18399-1-git-send-email-yangtiezhu@loongson.cn> References: <1692005246-18399-1-git-send-email-yangtiezhu@loongson.cn> X-CM-TRANSID: AQAAf8Bx3yOE89lkSLlZAA--.49910S5 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj9xXoW7Xw47AFy8GFWfJr48tFW7WrX_yoWkJrXEk3 W2ya18uw4xGr93Z34rWw4xJFyUG3y8uws7tr18Jas7JasavrWUCay8CrnrJrWDuw4qvr15 uF9xtryUAFyS9osvyTuYvTs0mTUanT9S1TB71UUUUUJqnTZGkaVYY2UrUUUUj1kv1TuYvT s0mT0YCTnIWjqI5I8CrVACY4xI64kE6c02F40Ex7xfYxn0WfASr-VFAUDa7-sFnT9fnUUI cSsGvfJTRUUUbaxYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I6I8E6xAIw20EY4v20x vaj40_Wr0E3s1l1IIY67AEw4v_Jrv_JF1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6r4UJVWxJr1ln4kS14v26r1Y6r17M2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12 xvs2x26I8E6xACxx1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q 6rW5McIj6I8E87Iv67AKxVWxJVW8Jr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7V AKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMxCIbckI1I0E14v2 6r1Y6r17MI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17 CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF 0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIx AIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVF xhVjvjDU0xZFpf9x07j8a9-UUUUU= X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774198416724148228 X-GMAIL-MSGID: 1774198416724148228 While at it, modify the die() declaration in ptrace.h to fix the following checkpatch warnings: WARNING: function definition argument 'const char *' should also have an identifier name WARNING: function definition argument 'struct pt_regs *' should also have an identifier name Signed-off-by: Tiezhu Yang --- arch/mips/include/asm/ptrace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h index aee8e0a..d05844e 100644 --- a/arch/mips/include/asm/ptrace.h +++ b/arch/mips/include/asm/ptrace.h @@ -159,7 +159,7 @@ static inline long regs_return_value(struct pt_regs *regs) extern asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall); extern asmlinkage void syscall_trace_leave(struct pt_regs *regs); -extern void die(const char *, struct pt_regs *); +extern void die(const char *str, struct pt_regs *regs); static inline void die_if_kernel(const char *str, struct pt_regs *regs) {