m68k: Fix VGA I/O defines
Subsystems (3)
PATCH 1/1 m68k: Fix VGA I/O defines
Including m86k's <asm/raw_io.h> in vga.h on nommu platforms results in conflicting defines with io_no.h for various I/O macros from the __raw_read and __raw_write families. An example error is
In file included from arch/m68k/include/asm/vga.h:12,
from include/video/vga.h:22, from include/linux/vgaarb.h:34, from drivers/video/aperture.c:12:
Quoted 1 line
Quoted 1 line
arch/m68k/include/asm/raw_io.h:39: warning: "__raw_readb" redefined
39 | #define __raw_readb in_8
|
In file included from arch/m68k/include/asm/io.h:6,
from include/linux/io.h:13,
from include/linux/irq.h:20,
from include/asm-generic/hardirq.h:17,
from ./arch/m68k/include/generated/asm/hardirq.h:1,
from include/linux/hardirq.h:11,
from include/linux/interrupt.h:11,
from include/linux/trace_recursion.h:5,
from include/linux/ftrace.h:10,
from include/linux/kprobes.h:28,
from include/linux/kgdb.h:19,
from include/linux/fb.h:6,
from drivers/video/aperture.c:5:
arch/m68k/include/asm/io_no.h:16: note: this is the location of the previous definition
16 | #define __raw_readb(addr) \
|Include <asm/io.h>, which avoid raw_io.h on nommu platforms. Also change the defined values of some of the read/write symbols in vga.h to __raw_read/__raw_write as the raw_in/raw_out symbols are not generally available.
--- arch/m68k/include/asm/vga.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/m68k/include/asm/vga.h +4 -4
@@ -9,7 +9,7 @@*/ #ifndef CONFIG_PCI -#include <asm/raw_io.h> +#include <asm/io.h> #include <asm/kmap.h> /*
@@ -29,9 +29,9 @@#define inw_p (port) 0#define outb_p (port, val) do { } while (0)#define outw (port, val) do { } while (0) -#define readb raw_inb -#define writeb raw_outb -#define writew raw_outw +#define readb __raw_readb +#define writeb __raw_writeb +#define writew __raw_writew#endif /* CONFIG_PCI */ #endif /* _ASM_M68K_VGA_H */
Signature · 1 line
2.47.1
Hi Thomas,
Quoted 33 lines · Thomas Zimmermann
Including m86k's <
asm/raw_io.h> invga.hon nommu platforms results in conflicting defines withio_no.hfor various I/O macros from the__raw_readand__raw_writefamilies. An example error isIn file included from
arch/m68k/include/asm/vga.h:12,
frominclude/video/vga.h:22, frominclude/linux/vgaarb.h:34, fromdrivers/video/aperture.c:12:Quoted 1 line
Quoted 1 line
arch/m68k/include/asm/raw_io.h:39: warning: "__raw_readb" redefined39 | #define __raw_readb in_8 | In file included from arch/m68k/include/asm/io.h:6, from include/linux/io.h:13, from include/linux/irq.h:20, from include/asm-generic/hardirq.h:17, from ./arch/m68k/include/generated/asm/hardirq.h:1, from include/linux/hardirq.h:11, from include/linux/interrupt.h:11, from include/linux/trace_recursion.h:5, from include/linux/ftrace.h:10, from include/linux/kprobes.h:28, from include/linux/kgdb.h:19, from include/linux/fb.h:6, from drivers/video/aperture.c:5: arch/m68k/include/asm/io_no.h:16: note: this is the location of the previous definition 16 | #define __raw_readb(addr) \ |Include <
asm/io.h>, which avoidraw_io.hon nommu platforms. Also change the defined values of some of the read/write symbols invga.hto __raw_read/__raw_write as the raw_in/raw_out symbols are not generally available.
Quoted 9 lines
Signed-off-by Thomas Zimmermann <[email protected]>Reported-by kernel test robot <[email protected]>Fixes 5c3f968712ce ("m68k/video: Create <asm/vga.h>")Cc Geert Uytterhoeven <[email protected]>Cc Helge Deller <[email protected]>Cc <[email protected]> # v3.5+
Thanks for your patch!
arch/m68k/include/asm/vga.h line 12
Quoted 8 lines
arch/m68k/include/asm/vga.h +1
-1@@ -9,7 +9,7 @@*/ #ifndef CONFIG_PCI -#include <asm/raw_io.h> +#include <asm/io.h>
It definitely makes sense to include <asm/io.h> instead of <asm/raw_io.h> in this file.
arch/m68k/include/asm/vga.h line 34
Quoted 13 lines
arch/m68k/include/asm/vga.h +3
-3#include <asm/kmap.h> /* @@ -29,9 +29,9 @@#define inw_p (port) 0#define outb_p (port, val) do { } while (0)#define outw (port, val) do { } while (0) -#define readb raw_inb -#define writeb raw_outb -#define writew raw_outw +#define readb __raw_readb +#define writeb __raw_writeb +#define writew __raw_writew
OK
arch/m68k/include/asm/vga.h line 37
Quoted 3 lines
arch/m68k/include/asm/vga.h +0
-0#endif /* CONFIG_PCI */ #endif /* _ASM_M68K_VGA_H */
I gave it a try on various configs, and inspected the impact (none, except for killing the warnings), so
i.e. will queue in the m68k tree for v6.14.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
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