git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
alpha
/
kernel
/
err_marvel.c
diff --git
a/arch/alpha/kernel/err_marvel.c
b/arch/alpha/kernel/err_marvel.c
index
8355284
..
f2956ac
100644
(file)
--- 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
}
void
-marvel_machine_check(u64 vector, u64 la_ptr
, struct pt_regs *regs
)
+marvel_machine_check(u64 vector, u64 la_ptr)
{
struct el_subpacket *el_ptr = (struct el_subpacket *)la_ptr;
int (*process_frame)(struct ev7_lf_subpackets *, int) = NULL;
{
struct el_subpacket *el_ptr = (struct el_subpacket *)la_ptr;
int (*process_frame)(struct ev7_lf_subpackets *, int) = NULL;
@@
-1077,7
+1077,8
@@
marvel_machine_check(u64 vector, u64 la_ptr, struct pt_regs *regs)
default:
/* Don't know it - pass it up. */
default:
/* Don't know it - pass it up. */
- return ev7_machine_check(vector, la_ptr, regs);
+ ev7_machine_check(vector, la_ptr);
+ return;
}
/*
}
/*