diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-08 15:44:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 21:32:36 +0200 |
| commit | 4fa1970a23bf8fc68e86b65a87c32556e20a6be6 (patch) | |
| tree | b6b46dd929623c302b3c3732cbeb5dbff2f7e95f /arch/alpha/kernel/sys_nautilus.c | |
| parent | [PATCH] alpha pt_regs cleanups: handle_irq() (diff) | |
| download | linux-4fa1970a23bf8fc68e86b65a87c32556e20a6be6.tar.xz linux-4fa1970a23bf8fc68e86b65a87c32556e20a6be6.zip | |
[PATCH] alpha pt_regs cleanups: machine_check()
do set_irq_regs() in caller, kill pt_regs argument.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/alpha/kernel/sys_nautilus.c')
| -rw-r--r-- | arch/alpha/kernel/sys_nautilus.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c index c0d696efec5b..93744bab73fb 100644 --- a/arch/alpha/kernel/sys_nautilus.c +++ b/arch/alpha/kernel/sys_nautilus.c @@ -124,8 +124,7 @@ naut_sys_machine_check(unsigned long vector, unsigned long la_ptr, in the system. They are analysed separately but all starts here. */ void -nautilus_machine_check(unsigned long vector, unsigned long la_ptr, - struct pt_regs *regs) +nautilus_machine_check(unsigned long vector, unsigned long la_ptr) { char *mchk_class; @@ -165,7 +164,7 @@ nautilus_machine_check(unsigned long vector, unsigned long la_ptr, else if (vector == SCB_Q_SYSMCHK) mchk_class = "Fatal"; else { - ev6_machine_check(vector, la_ptr, regs); + ev6_machine_check(vector, la_ptr); return; } @@ -173,7 +172,7 @@ nautilus_machine_check(unsigned long vector, unsigned long la_ptr, "[%s System Machine Check (NMI)]\n", vector, mchk_class); - naut_sys_machine_check(vector, la_ptr, regs); + naut_sys_machine_check(vector, la_ptr, get_irq_regs()); /* Tell the PALcode to clear the machine check */ draina(); |