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
/
mips
/
vr41xx
/
common
/
irq.c
diff --git
a/arch/mips/vr41xx/common/irq.c
b/arch/mips/vr41xx/common/irq.c
index
4733c53
..
16decf4
100644
(file)
--- a/
arch/mips/vr41xx/common/irq.c
+++ b/
arch/mips/vr41xx/common/irq.c
@@
-1,7
+1,7
@@
/*
* Interrupt handing routines for NEC VR4100 series.
*
/*
* Interrupt handing routines for NEC VR4100 series.
*
- * Copyright (C) 2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ * Copyright (C) 2005
-2007
Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-25,7
+25,7
@@
#include <asm/vr41xx/irq.h>
typedef struct irq_cascade {
#include <asm/vr41xx/irq.h>
typedef struct irq_cascade {
- int (*get_irq)(unsigned int
, struct pt_regs *
);
+ int (*get_irq)(unsigned int);
} irq_cascade_t;
static irq_cascade_t irq_cascade[NR_IRQS] __cacheline_aligned;
} irq_cascade_t;
static irq_cascade_t irq_cascade[NR_IRQS] __cacheline_aligned;
@@
-36,7
+36,7
@@
static struct irqaction cascade_irqaction = {
.name = "cascade",
};
.name = "cascade",
};
-int cascade_irq(unsigned int irq, int (*get_irq)(unsigned int
, struct pt_regs *
))
+int cascade_irq(unsigned int irq, int (*get_irq)(unsigned int))
{
int retval = 0;
{
int retval = 0;
@@
-59,7
+59,7
@@
int cascade_irq(unsigned int irq, int (*get_irq)(unsigned int, struct pt_regs *)
EXPORT_SYMBOL_GPL(cascade_irq);
EXPORT_SYMBOL_GPL(cascade_irq);
-static void irq_dispatch(unsigned int irq
, struct pt_regs *regs
)
+static void irq_dispatch(unsigned int irq)
{
irq_cascade_t *cascade;
struct irq_desc *desc;
{
irq_cascade_t *cascade;
struct irq_desc *desc;
@@
-73,40
+73,46
@@
static void irq_dispatch(unsigned int irq, struct pt_regs *regs)
if (cascade->get_irq != NULL) {
unsigned int source_irq = irq;
desc = irq_desc + source_irq;
if (cascade->get_irq != NULL) {
unsigned int source_irq = irq;
desc = irq_desc + source_irq;
- desc->chip->ack(source_irq);
- irq = cascade->get_irq(irq, regs);
+ if (desc->chip->mask_ack)
+ desc->chip->mask_ack(source_irq);
+ else {
+ desc->chip->mask(source_irq);
+ desc->chip->ack(source_irq);
+ }
+ irq = cascade->get_irq(irq);
if (irq < 0)
atomic_inc(&irq_err_count);
else
if (irq < 0)
atomic_inc(&irq_err_count);
else
- irq_dispatch(irq, regs);
- desc->chip->end(source_irq);
+ irq_dispatch(irq);
+ if (!(desc->status & IRQ_DISABLED) && desc->chip->unmask)
+ desc->chip->unmask(source_irq);
} else
} else
- do_IRQ(irq
, regs
);
+ do_IRQ(irq);
}
}
-asmlinkage void plat_irq_dispatch(
struct pt_regs *regs
)
+asmlinkage void plat_irq_dispatch(
void
)
{
unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM;
if (pending & CAUSEF_IP7)
{
unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM;
if (pending & CAUSEF_IP7)
- do_IRQ(7
, regs
);
+ do_IRQ(7);
else if (pending & 0x7800) {
if (pending & CAUSEF_IP3)
else if (pending & 0x7800) {
if (pending & CAUSEF_IP3)
- irq_dispatch(3
, regs
);
+ irq_dispatch(3);
else if (pending & CAUSEF_IP4)
else if (pending & CAUSEF_IP4)
- irq_dispatch(4
, regs
);
+ irq_dispatch(4);
else if (pending & CAUSEF_IP5)
else if (pending & CAUSEF_IP5)
- irq_dispatch(5
, regs
);
+ irq_dispatch(5);
else if (pending & CAUSEF_IP6)
else if (pending & CAUSEF_IP6)
- irq_dispatch(6
, regs
);
+ irq_dispatch(6);
} else if (pending & CAUSEF_IP2)
} else if (pending & CAUSEF_IP2)
- irq_dispatch(2
, regs
);
+ irq_dispatch(2);
else if (pending & CAUSEF_IP0)
else if (pending & CAUSEF_IP0)
- do_IRQ(0
, regs
);
+ do_IRQ(0);
else if (pending & CAUSEF_IP1)
else if (pending & CAUSEF_IP1)
- do_IRQ(1
, regs
);
+ do_IRQ(1);
else
else
- spurious_interrupt(
regs
);
+ spurious_interrupt();
}
void __init arch_init_irq(void)
}
void __init arch_init_irq(void)