Messages in this thread | | | From | Geert Uytterhoeven <> | Date | Mon, 19 Aug 2019 13:27:52 +0200 | Subject | Re: [PATCH] m68k: Prevent some compiler warnings in coldfire builds |
| |
On Mon, Aug 5, 2019 at 2:18 PM Greg Ungerer <gregungerer00@gmail.com> wrote: > On 5/8/19 5:14 pm, Geert Uytterhoeven wrote: > > On Sat, Aug 3, 2019 at 1:36 AM Greg Ungerer <gregungerer00@gmail.com> wrote: > >> On 2/8/19 10:10 am, Finn Thain wrote: > >>> Since commit d3b41b6bb49e ("m68k: Dispatch nvram_ops calls to Atari or > >>> Mac functions"), Coldfire builds generate compiler warnings due to the > >>> unconditional inclusion of asm/atarihw.h and asm/macintosh.h. > >>> > >>> The inclusion of asm/atarihw.h causes warnings like this: > >>> > >>> In file included from ./arch/m68k/include/asm/atarihw.h:25:0, > >>> from arch/m68k/kernel/setup_mm.c:41, > >>> from arch/m68k/kernel/setup.c:3: > >>> ./arch/m68k/include/asm/raw_io.h:39:0: warning: "__raw_readb" redefined > >>> #define __raw_readb in_8 > >>> > >>> In file included from ./arch/m68k/include/asm/io.h:6:0, > >>> from arch/m68k/kernel/setup_mm.c:36, > >>> from arch/m68k/kernel/setup.c:3: > >>> ./arch/m68k/include/asm/io_no.h:16:0: note: this is the location of the previous definition > >>> #define __raw_readb(addr) \ > >>> ... > >>> > >>> This issue is resolved by dropping the asm/raw_io.h include. It turns out > >>> that asm/io_mm.h already includes that header file. > >>> > >>> Moving the relevant macro definitions helps to clarify this dependency > >>> and make it safe to include asm/atarihw.h. > >>> > >>> The other warnings look like this: > >>> > >>> In file included from arch/m68k/kernel/setup_mm.c:48:0, > >>> from arch/m68k/kernel/setup.c:3: > >>> ./arch/m68k/include/asm/macintosh.h:19:35: warning: 'struct irq_data' declared inside parameter list will not be visible outside of this definition or declaration > >>> extern void mac_irq_enable(struct irq_data *data); > >>> ^~~~~~~~ > >>> ... > >>> > >>> This issue is resolved by adding the missing linux/irq.h include. > >>> > >>> Cc: Michael Schmitz <schmitzmic@gmail.com> > >>> Signed-off-by: Finn Thain <fthain@telegraphics.com.au> > > > >> > >> Looks good to me: > >> > >> Acked-by: Greg Ungerer <gerg@linux-m68k.org> > >> > >> Geert: I can take this via the m68knommu tree if you like? > >> Or if you want to pick it up then no problem. > > > > If you have fixes for m68knommu for v5.3, feel free to queue it. > > Else I can queue it for v5.4. > > > > Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> > > I don't currently have any fixes for 5.3 queued. > And there is no real hurry on this anyway, it can wait for 5.4. > So please add to your queue for 5.4
Thanks, applied and queued for v5.4.
Gr{oetje,eeting}s,
Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
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
| |