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
/
sys_nautilus.c
diff --git
a/arch/alpha/kernel/sys_nautilus.c
b/arch/alpha/kernel/sys_nautilus.c
index
c0d696e
..
e7594a7
100644
(file)
--- 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
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;
{
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 {
else if (vector == SCB_Q_SYSMCHK)
mchk_class = "Fatal";
else {
- ev6_machine_check(vector, la_ptr
, regs
);
+ ev6_machine_check(vector, la_ptr);
return;
}
return;
}
@@
-173,7
+172,7
@@
nautilus_machine_check(unsigned long vector, unsigned long la_ptr,
"[%s System Machine Check (NMI)]\n",
vector, mchk_class);
"[%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();
/* Tell the PALcode to clear the machine check */
draina();
@@
-201,7
+200,7
@@
nautilus_init_pci(void)
bus = pci_scan_bus(0, alpha_mv.pci_ops, hose);
hose->bus = bus;
bus = pci_scan_bus(0, alpha_mv.pci_ops, hose);
hose->bus = bus;
- irongate = pci_
fi
nd_slot(0, 0);
+ irongate = pci_
get_bus_a
nd_slot(0, 0);
bus->self = irongate;
bus->resource[1] = &irongate_mem;
bus->self = irongate;
bus->resource[1] = &irongate_mem;