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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
alpha
/
kernel
/
sys_titan.c
diff --git
a/arch/alpha/kernel/sys_titan.c
b/arch/alpha/kernel/sys_titan.c
index
302aab3
..
5f84417
100644
(file)
--- a/
arch/alpha/kernel/sys_titan.c
+++ b/
arch/alpha/kernel/sys_titan.c
@@
-12,6
+12,7
@@
* Granite
*/
* Granite
*/
+#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/mm.h>
@@
-65,7
+66,7
@@
titan_update_irq_hw(unsigned long mask)
register int bcpu = boot_cpuid;
#ifdef CONFIG_SMP
register int bcpu = boot_cpuid;
#ifdef CONFIG_SMP
- cpumask_t cpm = cpu_present_ma
p
;
+ cpumask_t cpm = cpu_present_ma
sk
;
volatile unsigned long *dim0, *dim1, *dim2, *dim3;
unsigned long mask0, mask1, mask2, mask3, dummy;
volatile unsigned long *dim0, *dim1, *dim2, *dim3;
unsigned long mask0, mask1, mask2, mask3, dummy;
@@
-188,7
+189,7
@@
init_titan_irqs(struct hw_interrupt_type * ops, int imin, int imax)
long i;
for (i = imin; i <= imax; ++i) {
irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
long i;
for (i = imin; i <= imax; ++i) {
irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
- irq_desc[i].
chip
= ops;
+ irq_desc[i].
handler
= ops;
}
}
}
}
@@
-279,15
+280,15
@@
titan_late_init(void)
* all reported to the kernel as machine checks, so the handler
* is a nop so it can be called to count the individual events.
*/
* all reported to the kernel as machine checks, so the handler
* is a nop so it can be called to count the individual events.
*/
- request_irq(63+16, titan_intr_nop,
IRQF_DISABLED,
+ request_irq(63+16, titan_intr_nop,
SA_INTERRUPT,
"CChip Error", NULL);
"CChip Error", NULL);
- request_irq(62+16, titan_intr_nop,
IRQF_DISABLED,
+ request_irq(62+16, titan_intr_nop,
SA_INTERRUPT,
"PChip 0 H_Error", NULL);
"PChip 0 H_Error", NULL);
- request_irq(61+16, titan_intr_nop,
IRQF_DISABLED,
+ request_irq(61+16, titan_intr_nop,
SA_INTERRUPT,
"PChip 1 H_Error", NULL);
"PChip 1 H_Error", NULL);
- request_irq(60+16, titan_intr_nop,
IRQF_DISABLED,
+ request_irq(60+16, titan_intr_nop,
SA_INTERRUPT,
"PChip 0 C_Error", NULL);
"PChip 0 C_Error", NULL);
- request_irq(59+16, titan_intr_nop,
IRQF_DISABLED,
+ request_irq(59+16, titan_intr_nop,
SA_INTERRUPT,
"PChip 1 C_Error", NULL);
/*
"PChip 1 C_Error", NULL);
/*
@@
-348,9
+349,9
@@
privateer_init_pci(void)
* Hook a couple of extra err interrupts that the
* common titan code won't.
*/
* Hook a couple of extra err interrupts that the
* common titan code won't.
*/
- request_irq(53+16, titan_intr_nop,
IRQF_DISABLED,
+ request_irq(53+16, titan_intr_nop,
SA_INTERRUPT,
"NMI", NULL);
"NMI", NULL);
- request_irq(50+16, titan_intr_nop,
IRQF_DISABLED,
+ request_irq(50+16, titan_intr_nop,
SA_INTERRUPT,
"Temperature Warning", NULL);
/*
"Temperature Warning", NULL);
/*