alpha: build fixes
PATCH 1/1 alpha: build fixes
This fixes some of the alpha-specific build problems, except a) modpost warning about COMMON symbol "saved_config" and b) nasty final link failure with gcc-4.x, -Os and scsi-disk driver configured built-in (due to jump table in .rodata referencing discarded .exit.text).
- build failure with gcc-4.2.x: fix up casts in cia_io* routines to avoid warnings ('discards qualifiers from pointer target type'), which are failures, thanks to -Werror;
- modpost warnings: add missing __init qualifier for titan and marvel; for non-generic build, move machine vectors from .data to .data.init.refok section;
- unbreak CPU-specific optimization: rearrange cpuflags-y assignments so that extended -mcpu value (ev56, pca56, ev67) overrides basic one (ev5, ev6) and not vice versa.
Ivan.
arch/alpha/Makefile +5 -5
@@ -14,13 +14,13 @@ LDFLAGS_vmlinux := -static -N #-relax CHECKFLAGS += -D__alpha__ -m64 cflags-y := -pipe -mno-fp-regs -ffixed-8 -msmall-data -cpuflags-$(CONFIG_ALPHA_EV67) := -mcpu=ev67 -cpuflags-$(CONFIG_ALPHA_EV6) := -mcpu=ev6 +cpuflags-$(CONFIG_ALPHA_EV4) := -mcpu=ev4 +cpuflags-$(CONFIG_ALPHA_EV5) := -mcpu=ev5 +cpuflags-$(CONFIG_ALPHA_EV56) := -mcpu=ev56 cpuflags-$(CONFIG_ALPHA_POLARIS) := -mcpu=pca56 cpuflags-$(CONFIG_ALPHA_SX164) := -mcpu=pca56 -cpuflags-$(CONFIG_ALPHA_EV56) := -mcpu=ev56 -cpuflags-$(CONFIG_ALPHA_EV5) := -mcpu=ev5 -cpuflags-$(CONFIG_ALPHA_EV4) := -mcpu=ev4 +cpuflags-$(CONFIG_ALPHA_EV6) := -mcpu=ev6 +cpuflags-$(CONFIG_ALPHA_EV67) := -mcpu=ev67 # If GENERIC, make sure to turn off any instruction set extensions that # the host compiler might have on by default. Given that EV4 and EV5 # have the same instruction set, prefer EV5 because an EV5 schedule is
include/asm-alpha/io_trivial.h +8 -4
@@ -72,25 +72,29 @@ IO_CONCAT(__IO_PREFIX,writew)(u16 b, vol __EXTERN_INLINE u8IO_CONCAT (__IO_PREFIX ,readb )(const volatile void __iomem *a) { -return IO_CONCAT (__IO_PREFIX,ioread8)((void __iomem *)a); +void __iomem *addr = (void __iomem *)a; +return IO_CONCAT (__IO_PREFIX,ioread8)(addr); } __EXTERN_INLINE u16IO_CONCAT (__IO_PREFIX ,readw )(const volatile void __iomem *a) { -return IO_CONCAT (__IO_PREFIX,ioread16)((void __iomem *)a); +void __iomem *addr = (void __iomem *)a; +return IO_CONCAT (__IO_PREFIX,ioread16)(addr); } __EXTERN_INLINE voidIO_CONCAT (__IO_PREFIX ,writeb )(u8 b,volatile void __iomem *a) { -IO_CONCAT (__IO_PREFIX,iowrite8)(b, (void __iomem *)a); +void __iomem *addr = (void __iomem *)a; +IO_CONCAT (__IO_PREFIX,iowrite8)(b, addr); } __EXTERN_INLINE voidIO_CONCAT (__IO_PREFIX ,writew )(u16 b,volatile void __iomem *a) { -IO_CONCAT (__IO_PREFIX,iowrite16)(b, (void __iomem *)a); +void __iomem *addr = (void __iomem *)a; +IO_CONCAT (__IO_PREFIX,iowrite16)(b, addr); }#endif
arch/alpha/kernel/err_marvel.c +1 -1
@@ -1152,7 +1152,7 @@ marvel_machine_check(u64 vector, u64 la_mb (); } -void +void __init marvel_register_error_handlers (void ) {ev7_register_error_handlers ();
arch/alpha/kernel/machvec_impl.h +1 -1
@@ -134,7 +134,7 @@#define __initmv __initdata#define ALIAS_MV (x)#else -#define __initmv +#define __initmv __initdata_refok/* GCC actually has a syntax for defining aliases, but is under some delusion that you shouldn't be able to declare it extern somewhere
arch/alpha/kernel/err_titan.c +1 -1
@@ -564,7 +564,7 @@ static struct el_subpacket_handler titanSUBPACKET_HANDLER_INIT (EL_CLASS__REGATTA_FAMILY , el_process_regatta_subpacket); -void +void __init titan_register_error_handlers (void ) {size_t i;
arch/alpha/kernel/err_ev7.c +1 -1
@@ -273,7 +273,7 @@ ev7_process_pal_subpacket(struct el_subpstruct el_subpacket_handler ev7_pal_subpacket_handler =SUBPACKET_HANDLER_INIT (EL_CLASS__PAL , ev7_process_pal_subpacket); -void +void __init ev7_register_error_handlers (void ) {int i;