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 <[email protected]>
---
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 <asm/irq.h>
#include <asm/machdep.h>
#include <asm/io.h>
+#include <asm/config.h>
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 <asm/apollohw.h>
#include <asm/irq.h>
#include <asm/machdep.h>
+#include <asm/config.h>
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 <asm/machdep.h>
#include <asm/hwtest.h>
#include <asm/io.h>
+#include <asm/config.h>
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 <asm/traps.h>
#include <asm/machdep.h>
#include <asm/bvme6000hw.h>
+#include <asm/config.h>
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 <asm/blinken.h>
#include <asm/io.h> /* readb() and writeb() */
#include <asm/hp300hw.h>
+#include <asm/config.h>
#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..cdbf8aec7d27
--- /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 datastructure and to configure the machine
+ */
+
+#ifndef _M68K_CONFIG_H
+#define _M68K_CONFIG_H
+
+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);
+
+#endif /* _M68K_CONFIG_H */
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 4b51bfd38e5f..226dc3750397 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -47,6 +47,7 @@
#endif
#include <asm/macintosh.h>
#include <asm/natfeat.h>
+#include <asm/config.h>
#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 <asm/mac_via.h>
#include <asm/mac_oss.h>
#include <asm/mac_psc.h>
+#include <asm/config.h>
/* 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 <asm/traps.h>
#include <asm/machdep.h>
#include <asm/mvme147hw.h>
+#include <asm/config.h>
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 <asm/traps.h>
#include <asm/machdep.h>
#include <asm/mvme16xhw.h>
+#include <asm/config.h>
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 <asm/traps.h>
#include <asm/machdep.h>
#include <asm/q40_master.h>
+#include <asm/config.h>
extern void q40_init_IRQ(void);
static void q40_get_model(char *model);
--
2.33.1
Hi Laurent,
On Mon, Jan 10, 2022 at 9:42 AM Laurent Vivier <[email protected]> wrote:
> 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 <[email protected]>
Thanks for your patch!
> --- /dev/null
> +++ b/arch/m68k/include/asm/config.h
> @@ -0,0 +1,33 @@
> +// SPDX-License-Identifier: GPL-2.0
scripts/checkpatch.pl says this is the wrong one.
> +
> +/*
> + * This file contains prototypes provided by each m68k machine
> + * to parse bootinfo datastructure and to configure the machine
data structures
> + */
> +
> +#ifndef _M68K_CONFIG_H
> +#define _M68K_CONFIG_H
> +
> +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 *);
Missing parameter names.
I can fix those while applying.
Reviewed-by: Geert Uytterhoeven <[email protected]>
i.e. will queue in the m68k for-v5.18 branch.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Le 10/01/2022 à 15:21, Geert Uytterhoeven a écrit :
> Hi Laurent,
>
> On Mon, Jan 10, 2022 at 9:42 AM Laurent Vivier <[email protected]> wrote:
>> 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 <[email protected]>
>
> Thanks for your patch!
>
>> --- /dev/null
>> +++ b/arch/m68k/include/asm/config.h
>> @@ -0,0 +1,33 @@
>> +// SPDX-License-Identifier: GPL-2.0
>
> scripts/checkpatch.pl says this is the wrong one.
I'm going to add a pre-commit git hook to run checkpatch.pl in the future...
>
>> +
>> +/*
>> + * This file contains prototypes provided by each m68k machine
>> + * to parse bootinfo datastructure and to configure the machine
>
> data structures
>
>> + */
>> +
>> +#ifndef _M68K_CONFIG_H
>> +#define _M68K_CONFIG_H
>> +
>> +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 *);
>
> Missing parameter names.
>
> I can fix those while applying.
Please, do.
>
> Reviewed-by: Geert Uytterhoeven <[email protected]>
> i.e. will queue in the m68k for-v5.18 branch.
>
> Gr{oetje,eeting}s,
>
> Geert
Thanks,
Laurent