projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../linux-2.6-watchdog-mm
[linux-drm-fsl-dcu.git]
/
arch
/
alpha
/
kernel
/
err_ev7.c
diff --git
a/arch/alpha/kernel/err_ev7.c
b/arch/alpha/kernel/err_ev7.c
index fed6b3d1b80364675b65c3b8220a834801868828..95463ab1cf358aebd5df0b9a4f5839ee79cbb182 100644
(file)
--- a/
arch/alpha/kernel/err_ev7.c
+++ b/
arch/alpha/kernel/err_ev7.c
@@
-118,7
+118,7
@@
ev7_collect_logout_frame_subpackets(struct el_subpacket *el_ptr,
}
void
-ev7_machine_check(u64 vector, u64 la_ptr
, struct pt_regs *regs
)
+ev7_machine_check(u64 vector, u64 la_ptr)
{
struct el_subpacket *el_ptr = (struct el_subpacket *)la_ptr;
char *saved_err_prefix = err_print_prefix;