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_titan.c
diff --git
a/arch/alpha/kernel/sys_titan.c
b/arch/alpha/kernel/sys_titan.c
index
5f84417
..
29ab7db
100644
(file)
--- a/
arch/alpha/kernel/sys_titan.c
+++ b/
arch/alpha/kernel/sys_titan.c
@@
-12,7
+12,6
@@
* 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>
@@
-66,7
+65,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
sk
;
+ cpumask_t cpm = cpu_present_ma
p
;
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;
@@
-168,18
+167,18
@@
titan_set_irq_affinity(unsigned int irq, cpumask_t affinity)
}
static void
}
static void
-titan_device_interrupt(unsigned long vector
, struct pt_regs * regs
)
+titan_device_interrupt(unsigned long vector)
{
printk("titan_device_interrupt: NOT IMPLEMENTED YET!! \n");
}
static void
{
printk("titan_device_interrupt: NOT IMPLEMENTED YET!! \n");
}
static void
-titan_srm_device_interrupt(unsigned long vector
, struct pt_regs * regs
)
+titan_srm_device_interrupt(unsigned long vector)
{
int irq;
irq = (vector - 0x800) >> 4;
{
int irq;
irq = (vector - 0x800) >> 4;
- handle_irq(irq
, regs
);
+ handle_irq(irq);
}
}
@@
-189,7
+188,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].
handler
= ops;
+ irq_desc[i].
chip
= ops;
}
}
}
}
@@
-205,7
+204,7
@@
static struct hw_interrupt_type titan_irq_type = {
};
static irqreturn_t
};
static irqreturn_t
-titan_intr_nop(int irq, void *dev_id
, struct pt_regs *regs)
+titan_intr_nop(int irq, void *dev_id
)
{
/*
* This is a NOP interrupt handler for the purposes of
{
/*
* This is a NOP interrupt handler for the purposes of
@@
-244,7
+243,7
@@
titan_legacy_init_irq(void)
}
void
}
void
-titan_dispatch_irqs(u64 mask
, struct pt_regs *regs
)
+titan_dispatch_irqs(u64 mask)
{
unsigned long vector;
{
unsigned long vector;
@@
-264,7
+263,7
@@
titan_dispatch_irqs(u64 mask, struct pt_regs *regs)
vector = 0x900 + (vector << 4); /* convert to SRM vector */
/* dispatch it */
vector = 0x900 + (vector << 4); /* convert to SRM vector */
/* dispatch it */
- alpha_mv.device_interrupt(vector
, regs
);
+ alpha_mv.device_interrupt(vector);
}
}
}
}
@@
-280,15
+279,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,
SA_INTERRUPT,
+ request_irq(63+16, titan_intr_nop,
IRQF_DISABLED,
"CChip Error", NULL);
"CChip Error", NULL);
- request_irq(62+16, titan_intr_nop,
SA_INTERRUPT,
+ request_irq(62+16, titan_intr_nop,
IRQF_DISABLED,
"PChip 0 H_Error", NULL);
"PChip 0 H_Error", NULL);
- request_irq(61+16, titan_intr_nop,
SA_INTERRUPT,
+ request_irq(61+16, titan_intr_nop,
IRQF_DISABLED,
"PChip 1 H_Error", NULL);
"PChip 1 H_Error", NULL);
- request_irq(60+16, titan_intr_nop,
SA_INTERRUPT,
+ request_irq(60+16, titan_intr_nop,
IRQF_DISABLED,
"PChip 0 C_Error", NULL);
"PChip 0 C_Error", NULL);
- request_irq(59+16, titan_intr_nop,
SA_INTERRUPT,
+ request_irq(59+16, titan_intr_nop,
IRQF_DISABLED,
"PChip 1 C_Error", NULL);
/*
"PChip 1 C_Error", NULL);
/*
@@
-349,9
+348,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,
SA_INTERRUPT,
+ request_irq(53+16, titan_intr_nop,
IRQF_DISABLED,
"NMI", NULL);
"NMI", NULL);
- request_irq(50+16, titan_intr_nop,
SA_INTERRUPT,
+ request_irq(50+16, titan_intr_nop,
IRQF_DISABLED,
"Temperature Warning", NULL);
/*
"Temperature Warning", NULL);
/*