From mboxrd@z Thu Jan 1 00:00:00 1970 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 EF2D2C433F5 for ; Sun, 30 Jan 2022 14:33:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355015AbiA3Odx (ORCPT ); Sun, 30 Jan 2022 09:33:53 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:34591 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355010AbiA3Odw (ORCPT ); Sun, 30 Jan 2022 09:33:52 -0500 Received: from quad ([82.142.10.94]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MS4WT-1mpkdt3G9L-00TVRi; Sun, 30 Jan 2022 15:33:39 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Arnd Bergmann , linux-rtc@vger.kernel.org, Jiaxun Yang , Stephen Boyd , John Stultz , Alexandre Belloni , Alessandro Zummo , Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org, Daniel Lezcano , Thomas Gleixner , Laurent Vivier Subject: [PATCH v14 1/5] m68k: add asm/config.h Date: Sun, 30 Jan 2022 15:33:29 +0100 Message-Id: <20220130143333.552646-2-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220130143333.552646-1-laurent@vivier.eu> References: <20220130143333.552646-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:kMSKGKkxNv1a1eN2ypugXU4Ago5SMMMeVURxMVgqYjNxTYxgj7S 2o4SwgztjInAztiJRdM5JV2pPgaf/mXSyNkNmtvKKQApiIObNHuAIYz5zwLTudQTCNoZNhy dsdZA1a3VwCBaJTbZctjssKotDKxTyXahVqAsqONnzwupuwEZr71FGhONzxieYToIf5Wjil OEqMGIAl3ftcP5cnvp2AQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:bqb3pZsELRI=:piZ7DDAbAUCE3qblElJuwP Ed8q3odP2rkxynXfoEOkqoqqWR3iV5UtBJvhFP028NpEetH/rJ9IJJyUeLAlTpgetWxu4z3cG 8+OEiExfUZDdY00QKqTjM+AcVMjLojqKmCtLr3pXH+Dn3Mncb8cDjDu3uDMa/7dcqg0hmk1Eq 7Ys4gahTmHHLmHPhN8/Q/+CWOfWMoQf6MPi5tuGbOsisaYQgjpvaFXiQsMOQxV8WMgzzMiMt0 wleRAjWFzMpkEpzg/vAOsnp2msg4I9qr60JoletHhGqF56kos58YTUW7KPJXLeddlj6qQPD4V eS6vjDRf0ib0Q14WmaMpnSUuikkNXFEbAhj+fzW/UO0TWqfq0FyEnIZVZDOnhEkEeun/VMnaP oRR+LJjFBvJUB3ubb6A6dS33qwUhUvbsO/vWYPqTNgAPrfOnbcQEA65wpbihZ+ROKtImOiPkz My+3o09rjDYqDrM6oLsIe+bx+QWxKI6JxPuKjKsse9nYz1pRFQu299YGdpxgvTElhE+ThHgzW +o2WBKviEj5QOVUf3422cIfZkzHueGLzwqA7KKNIdJicmt8bTgu1gUSJAalVnwZ4A9CokZOL/ x6GMDq8w8iE0jGiIzDNmdsSw5b5lL62J3ysnlFFxMhowJvIsx3l7D8+Cvu/OT1nAyPvtUm3Hu grDnsqW6IwoWPejtnxNYAESOVbHNr90ATVqml9ENK764gwwAH6E3aD/02wfKmNgKYvv8= Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org To avoid 'warning: no previous prototype for' error, declare all the parse_bootinfo and config functions prototypes into asm/config.h and include it in arch/m68k/kernel/setup_mm.c and arch/m68k/*/config.c Signed-off-by: Laurent Vivier Reviewed-by: Geert Uytterhoeven --- arch/m68k/amiga/config.c | 1 + arch/m68k/apollo/config.c | 1 + arch/m68k/atari/config.c | 1 + arch/m68k/bvme6000/config.c | 1 + arch/m68k/hp300/config.c | 1 + arch/m68k/include/asm/config.h | 33 +++++++++++++++++++++++++++++++++ arch/m68k/kernel/setup_mm.c | 23 +---------------------- arch/m68k/mac/config.c | 1 + arch/m68k/mvme147/config.c | 1 + arch/m68k/mvme16x/config.c | 1 + arch/m68k/q40/config.c | 1 + 11 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 arch/m68k/include/asm/config.h diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index be2dfab48fd4..3137b45750df 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c @@ -37,6 +37,7 @@ #include #include #include +#include static unsigned long amiga_model; diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c index 581a5f68d102..42a8b8e2b664 100644 --- a/arch/m68k/apollo/config.c +++ b/arch/m68k/apollo/config.c @@ -16,6 +16,7 @@ #include #include #include +#include u_long sio01_physaddr; u_long sio23_physaddr; diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index 261a0f57cc9a..38a7c0578105 100644 --- a/arch/m68k/atari/config.c +++ b/arch/m68k/atari/config.c @@ -46,6 +46,7 @@ #include #include #include +#include u_long atari_mch_cookie; EXPORT_SYMBOL(atari_mch_cookie); diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c index 0c6feafbbd11..9b060d466e03 100644 --- a/arch/m68k/bvme6000/config.c +++ b/arch/m68k/bvme6000/config.c @@ -36,6 +36,7 @@ #include #include #include +#include static void bvme6000_get_model(char *model); extern void bvme6000_sched_init(void); diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c index ce1eb3d3d55d..2c92843397c3 100644 --- a/arch/m68k/hp300/config.c +++ b/arch/m68k/hp300/config.c @@ -22,6 +22,7 @@ #include #include /* readb() and writeb() */ #include +#include #include "time.h" diff --git a/arch/m68k/include/asm/config.h b/arch/m68k/include/asm/config.h new file mode 100644 index 000000000000..aae61070628b --- /dev/null +++ b/arch/m68k/include/asm/config.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * This file contains prototypes provided by each m68k machine + * to parse bootinfo data structures and to configure the machine + */ + +#ifndef _M68K_CONFIG_H +#define _M68K_CONFIG_H + +extern int amiga_parse_bootinfo(const struct bi_record *record); +extern int atari_parse_bootinfo(const struct bi_record *record); +extern int mac_parse_bootinfo(const struct bi_record *record); +extern int q40_parse_bootinfo(const struct bi_record *record); +extern int bvme6000_parse_bootinfo(const struct bi_record *record); +extern int mvme16x_parse_bootinfo(const struct bi_record *record); +extern int mvme147_parse_bootinfo(const struct bi_record *record); +extern int hp300_parse_bootinfo(const struct bi_record *record); +extern int apollo_parse_bootinfo(const struct bi_record *record); + +extern void config_amiga(void); +extern void config_atari(void); +extern void config_mac(void); +extern void config_sun3(void); +extern void config_apollo(void); +extern void config_mvme147(void); +extern void config_mvme16x(void); +extern void config_bvme6000(void); +extern void config_hp300(void); +extern void config_q40(void); +extern void config_sun3x(void); + +#endif /* _M68K_CONFIG_H */ diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index 49e573b94326..8228275aae3e 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c @@ -47,6 +47,7 @@ #endif #include #include +#include #if !FPSTATESIZE || !NR_IRQS #warning No CPU/platform type selected, your kernel will not work! @@ -113,28 +114,6 @@ EXPORT_SYMBOL(isa_type); EXPORT_SYMBOL(isa_sex); #endif -extern int amiga_parse_bootinfo(const struct bi_record *); -extern int atari_parse_bootinfo(const struct bi_record *); -extern int mac_parse_bootinfo(const struct bi_record *); -extern int q40_parse_bootinfo(const struct bi_record *); -extern int bvme6000_parse_bootinfo(const struct bi_record *); -extern int mvme16x_parse_bootinfo(const struct bi_record *); -extern int mvme147_parse_bootinfo(const struct bi_record *); -extern int hp300_parse_bootinfo(const struct bi_record *); -extern int apollo_parse_bootinfo(const struct bi_record *); - -extern void config_amiga(void); -extern void config_atari(void); -extern void config_mac(void); -extern void config_sun3(void); -extern void config_apollo(void); -extern void config_mvme147(void); -extern void config_mvme16x(void); -extern void config_bvme6000(void); -extern void config_hp300(void); -extern void config_q40(void); -extern void config_sun3x(void); - #define MASK_256K 0xfffc0000 extern void paging_init(void); diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 5d16f9b47aa9..65d124ec80bb 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -47,6 +47,7 @@ #include #include #include +#include /* Mac bootinfo struct */ struct mac_booter_data mac_bi_data; diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c index dfd6202fd403..b96ea7c76a19 100644 --- a/arch/m68k/mvme147/config.c +++ b/arch/m68k/mvme147/config.c @@ -34,6 +34,7 @@ #include #include #include +#include static void mvme147_get_model(char *model); diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c index b4422c2dfbbf..88cbdc10925b 100644 --- a/arch/m68k/mvme16x/config.c +++ b/arch/m68k/mvme16x/config.c @@ -37,6 +37,7 @@ #include #include #include +#include extern t_bdid mvme_bdid; diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c index 5caf1e5be1c2..9237243077ce 100644 --- a/arch/m68k/q40/config.c +++ b/arch/m68k/q40/config.c @@ -34,6 +34,7 @@ #include #include #include +#include extern void q40_init_IRQ(void); static void q40_get_model(char *model); -- 2.34.1