diff options
author | Ivan Kokshaysky <ink@jurassic.park.msu.ru> | 2009-04-30 18:08:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-02 18:36:10 -0400 |
commit | 1ffb1c0c64b4a2b75eed1f63cc47f2beb711c92f (patch) | |
tree | d94e3a720d43dbac8c7677f3230cfb4fadc3e4bd /arch/alpha/kernel/err_titan.c | |
parent | b175dc09285b36200a83b78baf167905181fb4e5 (diff) |
alpha: titan and marvel build fixes
These platforms got broken after u64 => 'long long' conversion.
Apparently that change was compile-tested with 'make allmodconfig', but it
doesn't include systems that depend on !ALPHA_LEGACY_START_ADDRESS.
Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/err_titan.c b/arch/alpha/kernel/err_titan.c index c7e28a88d6e3..f7ed97ce0dfd 100644 --- a/arch/alpha/kernel/err_titan.c +++ b/arch/alpha/kernel/err_titan.c | |||
@@ -380,7 +380,7 @@ titan_process_logout_frame(struct el_common *mchk_header, int print) | |||
380 | } | 380 | } |
381 | 381 | ||
382 | void | 382 | void |
383 | titan_machine_check(u64 vector, u64 la_ptr) | 383 | titan_machine_check(unsigned long vector, unsigned long la_ptr) |
384 | { | 384 | { |
385 | struct el_common *mchk_header = (struct el_common *)la_ptr; | 385 | struct el_common *mchk_header = (struct el_common *)la_ptr; |
386 | struct el_TITAN_sysdata_mcheck *tmchk = | 386 | struct el_TITAN_sysdata_mcheck *tmchk = |
@@ -702,7 +702,7 @@ privateer_process_logout_frame(struct el_common *mchk_header, int print) | |||
702 | } | 702 | } |
703 | 703 | ||
704 | void | 704 | void |
705 | privateer_machine_check(u64 vector, u64 la_ptr) | 705 | privateer_machine_check(unsigned long vector, unsigned long la_ptr) |
706 | { | 706 | { |
707 | struct el_common *mchk_header = (struct el_common *)la_ptr; | 707 | struct el_common *mchk_header = (struct el_common *)la_ptr; |
708 | struct el_TITAN_sysdata_mcheck *tmchk = | 708 | struct el_TITAN_sysdata_mcheck *tmchk = |