Message ID | 5971770.lOV4Wx5bFT@eto.sf-tec.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp2046100vqi; Sun, 17 Sep 2023 02:26:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE0DiaJrL/TkToX6AJdQLfssmZgZVAlzVcnSJdjpuhu7hhIBQjDRyttSWyhaDpbSk7eSRIA X-Received: by 2002:a17:902:6b01:b0:1c3:343c:f8b0 with SMTP id o1-20020a1709026b0100b001c3343cf8b0mr6081870plk.66.1694942792227; Sun, 17 Sep 2023 02:26:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694942792; cv=none; d=google.com; s=arc-20160816; b=nXsfaTmdNclE9inazeos4RqYPJmNIugiD5rMG3IWYdS76Ng7zq/zSAa7TC3Zyj4E5N YrP5Br/+3RhMlyfX97+lFHe0DewCDlGBNMvmjrBtSvqQI3w91Fj0USyJRnreNIQj3rfO c4xCvgHIOkDhgZoAEMuEsJaSFGZUFG7YIO9T/5U2L72RdawfA7pfm8bq4V8OZaxOYs9F RKKQc7REC69pMJgdy+HtAQjLVUrzzG8nTrAXMVnOUjfI4NEydbGYg0rTv7FPqdcZ4MOs aA4PiAobtsBtAvsMqkSq69OOBBbQS62fjTZ6ETzsDA+FEIulgQcizx2UDTOvDaG9iFkW kCow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=stCAa4mZ4DXLT+qZnCU3fG/aLYKPJEnvf3hUmPToZNU=; fh=PTBnj7SpVCpI7XsflygsIOAZW2q97GZ9pCNdLlfQd1w=; b=ufYg59EGcD1EzI7nt6jM8/pOwUqm21u2fgTJI8LK+FUR0OaIE+U+HjaYfMd1BIrsF4 BD4PWZ/zNxOrIuW3sV/+zJt+qQyR95rf80VHpw4rdkP1zfQLi7dy+CZjUYr2HublucGM SpMA/xI3JusfUkQwJn0yYJj0bCughxwJkfVrwh44o7yuGiergW+mGaFFwIDy1wXTOply PEE31UvrZ8Nn9BfNMIkJbjU2Vbk4hLceyFMfmK4iRpwjAFEpmKh1usBvDmFxRnEjKibt 7J6Vryyg2E6xLQA3Id4oyw3GmXk+EPmqKp3EC7I5PKeSCNuxfyihlY3seFAxBFz/Etg0 Oi9A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id u7-20020a170903124700b001bdc664cd5fsi6554569plh.168.2023.09.17.02.26.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 02:26:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id F263B8298B67; Sun, 17 Sep 2023 02:26:10 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235658AbjIQJZS (ORCPT <rfc822;toshivichauhan@gmail.com> + 29 others); Sun, 17 Sep 2023 05:25:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235156AbjIQJZN (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sun, 17 Sep 2023 05:25:13 -0400 X-Greylist: delayed 400 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sun, 17 Sep 2023 02:25:03 PDT Received: from mail.sf-mail.de (mail.sf-mail.de [IPv6:2a01:4f8:1c17:6fae:616d:6c69:616d:6c69]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2688718B for <linux-kernel@vger.kernel.org>; Sun, 17 Sep 2023 02:25:03 -0700 (PDT) Received: (qmail 7778 invoked from network); 17 Sep 2023 09:18:49 -0000 Received: from unknown ([2001:9e8:6dcb::76d4:35ff:feb7:be92]:52778 HELO eto.sf-tec.de) (auth=eike@sf-mail.de) by mail.sf-mail.de (Qsmtpd 0.39dev) with (TLS_AES_256_GCM_SHA384 encrypted) ESMTPSA for <geert@linux-m68k.org>; Sun, 17 Sep 2023 11:18:49 +0200 From: Rolf Eike Beer <eike-kernel@sf-tec.de> To: Geert Uytterhoeven <geert@linux-m68k.org> Cc: linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org Subject: [PATCH] m68k: add missing types to asm/irq.h Date: Sun, 17 Sep 2023 11:18:20 +0200 Message-ID: <5971770.lOV4Wx5bFT@eto.sf-tec.de> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sun, 17 Sep 2023 02:26:11 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777276333391112456 X-GMAIL-MSGID: 1777276333391112456 |
Series |
m68k: add missing types to asm/irq.h
|
|
Commit Message
Rolf Eike Beer
Sept. 17, 2023, 9:18 a.m. UTC
As reported in f8b648bf6628 ("net: sunhme: move asm includes to below linux
includes") when including this <asm/*> header before the needed <linux/*>
headers the compilation will fail because of missing types.
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
---
arch/m68k/include/asm/irq.h | 3 +++
1 file changed, 3 insertions(+)
The patch is entirely untested.
Comments
Hi Rolf, Thanks for your patch! On Sun, Sep 17, 2023 at 11:18 AM Rolf Eike Beer <eike-kernel@sf-tec.de> wrote: > As reported in f8b648bf6628 ("net: sunhme: move asm includes to below linux > includes") when including this <asm/*> header before the needed <linux/*> > headers the compilation will fail because of missing types. arch/m68k/include/asm/irq.h:66:20: warning: ‘struct pt_regs’ declared inside parameter list will not be visible outside of this definition or declaration 66 | struct pt_regs *)); | ^~~~~~~ arch/m68k/include/asm/irq.h:78:11: error: expected ‘;’ before ‘void’ 78 | asmlinkage void do_IRQ(int irq, struct pt_regs *regs); | ^~~~~ | ; arch/m68k/include/asm/irq.h:78:40: warning: ‘struct pt_regs’ declared inside parameter list will not be visible outside of this definition or declaration 78 | asmlinkage void do_IRQ(int irq, struct pt_regs *regs); | ^~~~~~~ arch/m68k/include/asm/irq.h:79:8: error: unknown type name ‘atomic_t’ 79 | extern atomic_t irq_err_count; | ^~~~~~~~ > Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de> > --- a/arch/m68k/include/asm/irq.h > +++ b/arch/m68k/include/asm/irq.h > @@ -2,6 +2,8 @@ > #ifndef _M68K_IRQ_H_ > #define _M68K_IRQ_H_ > > +#include <linux/types.h> When just including this file, that still leads to: arch/m68k/include/asm/irq.h:82:11: error: expected ‘;’ before ‘void’ 82 | asmlinkage void do_IRQ(int irq, struct pt_regs *regs); | ^~~~~ | ; Instead, you want: #include <linux/atomic.h> #include <linux/linkage.h> > + > /* > * This should be the same as the max(NUM_X_SOURCES) for all the > * different m68k hosts compiled into the kernel. > @@ -59,6 +61,7 @@ > struct irq_data; > struct irq_chip; > struct irq_desc; > +struct pt_regs; OK > extern unsigned int m68k_irq_startup(struct irq_data *data); > extern unsigned int m68k_irq_startup_irq(unsigned int irq); > extern void m68k_irq_shutdown(struct irq_data *data); Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> i.e. will queue in the m68k for-v6.7 branch, with the above fixed. Gr{oetje,eeting}s, Geert
diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h index 7829e955ca04..4b182bad0526 100644 --- a/arch/m68k/include/asm/irq.h +++ b/arch/m68k/include/asm/irq.h @@ -2,6 +2,8 @@ #ifndef _M68K_IRQ_H_ #define _M68K_IRQ_H_ +#include <linux/types.h> + /* * This should be the same as the max(NUM_X_SOURCES) for all the * different m68k hosts compiled into the kernel. @@ -59,6 +61,7 @@ struct irq_data; struct irq_chip; struct irq_desc; +struct pt_regs; extern unsigned int m68k_irq_startup(struct irq_data *data); extern unsigned int m68k_irq_startup_irq(unsigned int irq); extern void m68k_irq_shutdown(struct irq_data *data);