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
/
core_tsunami.c
diff --git
a/arch/alpha/kernel/core_tsunami.c
b/arch/alpha/kernel/core_tsunami.c
index
215a861
..
ce623c6
100644
(file)
--- a/
arch/alpha/kernel/core_tsunami.c
+++ b/
arch/alpha/kernel/core_tsunami.c
@@
-263,9
+263,9
@@
tsunami_init_one_pchip(tsunami_pchip *pchip, int index)
hose->sparse_mem_base = 0;
hose->sparse_io_base = 0;
hose->dense_mem_base
hose->sparse_mem_base = 0;
hose->sparse_io_base = 0;
hose->dense_mem_base
- = (TSUNAMI_MEM(index) & 0xffffffffff
) | 0x80000000000
;
+ = (TSUNAMI_MEM(index) & 0xffffffffff
L) | 0x80000000000L
;
hose->dense_io_base
hose->dense_io_base
- = (TSUNAMI_IO(index) & 0xffffffffff
) | 0x80000000000
;
+ = (TSUNAMI_IO(index) & 0xffffffffff
L) | 0x80000000000L
;
hose->config_space_base = TSUNAMI_CONF(index);
hose->index = index;
hose->config_space_base = TSUNAMI_CONF(index);
hose->index = index;
@@
-443,8
+443,7
@@
tsunami_pci_clr_err(void)
}
void
}
void
-tsunami_machine_check(unsigned long vector, unsigned long la_ptr,
- struct pt_regs * regs)
+tsunami_machine_check(unsigned long vector, unsigned long la_ptr)
{
/* Clear error before any reporting. */
mb();
{
/* Clear error before any reporting. */
mb();
@@
-454,6
+453,6
@@
tsunami_machine_check(unsigned long vector, unsigned long la_ptr,
wrmces(0x7);
mb();
wrmces(0x7);
mb();
- process_mcheck_info(vector, la_ptr,
regs,
"TSUNAMI",
+ process_mcheck_info(vector, la_ptr, "TSUNAMI",
mcheck_expected(smp_processor_id()));
}
mcheck_expected(smp_processor_id()));
}