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_wildfire.c
diff --git
a/arch/alpha/kernel/sys_wildfire.c
b/arch/alpha/kernel/sys_wildfire.c
index
959e8d7
..
42c3eed
100644
(file)
--- a/
arch/alpha/kernel/sys_wildfire.c
+++ b/
arch/alpha/kernel/sys_wildfire.c
@@
-12,12
+12,12
@@
#include <linux/sched.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/bitops.h>
#include <asm/ptrace.h>
#include <asm/system.h>
#include <asm/dma.h>
#include <asm/irq.h>
#include <asm/ptrace.h>
#include <asm/system.h>
#include <asm/dma.h>
#include <asm/irq.h>
-#include <asm/bitops.h>
#include <asm/mmu_context.h>
#include <asm/io.h>
#include <asm/pgtable.h>
#include <asm/mmu_context.h>
#include <asm/io.h>
#include <asm/pgtable.h>
@@
-32,7
+32,7
@@
static unsigned long cached_irq_mask[WILDFIRE_NR_IRQS/(sizeof(long)*8)];
static unsigned long cached_irq_mask[WILDFIRE_NR_IRQS/(sizeof(long)*8)];
-
spinlock_t wildfire_irq_lock = SPIN_LOCK_UNLOCKED
;
+
DEFINE_SPINLOCK(wildfire_irq_lock)
;
static int doing_init_irq_hw = 0;
static int doing_init_irq_hw = 0;
@@
-199,14
+199,14
@@
wildfire_init_irq_per_pca(int qbbno, int pcano)
if (i == 2)
continue;
irq_desc[i+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;
if (i == 2)
continue;
irq_desc[i+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;
- irq_desc[i+irq_bias].
handler
= &wildfire_irq_type;
+ irq_desc[i+irq_bias].
chip
= &wildfire_irq_type;
}
irq_desc[36+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;
}
irq_desc[36+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;
- irq_desc[36+irq_bias].
handler
= &wildfire_irq_type;
+ irq_desc[36+irq_bias].
chip
= &wildfire_irq_type;
for (i = 40; i < 64; ++i) {
irq_desc[i+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;
for (i = 40; i < 64; ++i) {
irq_desc[i+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;
- irq_desc[i+irq_bias].
handler
= &wildfire_irq_type;
+ irq_desc[i+irq_bias].
chip
= &wildfire_irq_type;
}
setup_irq(32+irq_bias, &isa_enable);
}
setup_irq(32+irq_bias, &isa_enable);
@@
-234,7
+234,7
@@
wildfire_init_irq(void)
}
static void
}
static void
-wildfire_device_interrupt(unsigned long vector
, struct pt_regs * regs
)
+wildfire_device_interrupt(unsigned long vector)
{
int irq;
{
int irq;
@@
-246,7
+246,7
@@
wildfire_device_interrupt(unsigned long vector, struct pt_regs * regs)
* bits 5-0: irq in PCA
*/
* bits 5-0: irq in PCA
*/
- handle_irq(irq
, regs
);
+ handle_irq(irq);
return;
}
return;
}