diff options
author | Ivan Kokshaysky <ink@jurassic.park.msu.ru> | 2007-12-17 19:19:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 22:28:16 -0500 |
commit | 9548b209a37397f3036aa5bd3d5b4d3b725aa11a (patch) | |
tree | 9861b26f3ad69f0ac30ac04cf877faa951c9acd5 /arch/alpha/kernel/err_titan.c | |
parent | b47b6f38e5202c924bfe7632dce5dda4e3d40731 (diff) |
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>
Diffstat (limited to 'arch/alpha/kernel/err_titan.c')
-rw-r--r-- | arch/alpha/kernel/err_titan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/err_titan.c b/arch/alpha/kernel/err_titan.c index 6f3867877d9e..257449ed15ef 100644 --- a/arch/alpha/kernel/err_titan.c +++ b/arch/alpha/kernel/err_titan.c | |||
@@ -564,7 +564,7 @@ static struct el_subpacket_handler titan_subpacket_handler = | |||
564 | SUBPACKET_HANDLER_INIT(EL_CLASS__REGATTA_FAMILY, | 564 | SUBPACKET_HANDLER_INIT(EL_CLASS__REGATTA_FAMILY, |
565 | el_process_regatta_subpacket); | 565 | el_process_regatta_subpacket); |
566 | 566 | ||
567 | void | 567 | void __init |
568 | titan_register_error_handlers(void) | 568 | titan_register_error_handlers(void) |
569 | { | 569 | { |
570 | size_t i; | 570 | size_t i; |