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.

Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile
index 63104ebd1806..4e1a8e2c4541 100644
--- a/arch/alpha/Makefile
+++ b/arch/alpha/Makefile
@@ -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