diff options
| author |   Ivan Kokshaysky <ink@jurassic.park.msu.ru> | 2009-04-30 15:08:45 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-02 15:36:10 -0700 |
| commit | 1ffb1c0c64b4a2b75eed1f63cc47f2beb711c92f (patch) | |
| tree | d94e3a720d43dbac8c7677f3230cfb4fadc3e4bd /arch/alpha/kernel/err_marvel.c | |
| parent | vgacon: return the upper half of 512 character fonts (diff) | |
| download | linux-dev-1ffb1c0c64b4a2b75eed1f63cc47f2beb711c92f.tar.xz linux-dev-1ffb1c0c64b4a2b75eed1f63cc47f2beb711c92f.zip | |
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_marvel.c')
| -rw-r--r-- | arch/alpha/kernel/err_marvel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/err_marvel.c b/arch/alpha/kernel/err_marvel.c index 6bfd243efba3..52a79dfc13c6 100644 --- a/arch/alpha/kernel/err_marvel.c +++ b/arch/alpha/kernel/err_marvel.c @@ -1042,7 +1042,7 @@ marvel_process_logout_frame(struct ev7_lf_subpackets *lf_subpackets, int print) } void -marvel_machine_check(u64 vector, u64 la_ptr) +marvel_machine_check(unsigned long vector, unsigned long la_ptr) { struct el_subpacket *el_ptr = (struct el_subpacket *)la_ptr; int (*process_frame)(struct ev7_lf_subpackets *, int) = NULL; |