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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
mips
/
sgi-ip32
/
ip32-irq.c
diff --git
a/arch/mips/sgi-ip32/ip32-irq.c
b/arch/mips/sgi-ip32/ip32-irq.c
index
8ba0804
..
c64a820
100644
(file)
--- a/
arch/mips/sgi-ip32/ip32-irq.c
+++ b/
arch/mips/sgi-ip32/ip32-irq.c
@@
-125,9
+125,9
@@
extern irqreturn_t crime_memerr_intr (int irq, void *dev_id,
extern irqreturn_t crime_cpuerr_intr (int irq, void *dev_id,
struct pt_regs *regs);
extern irqreturn_t crime_cpuerr_intr (int irq, void *dev_id,
struct pt_regs *regs);
-struct irqaction memerr_irq = { crime_memerr_intr,
SA_INTERRUPT
,
+struct irqaction memerr_irq = { crime_memerr_intr,
IRQF_DISABLED
,
CPU_MASK_NONE, "CRIME memory error", NULL, NULL };
CPU_MASK_NONE, "CRIME memory error", NULL, NULL };
-struct irqaction cpuerr_irq = { crime_cpuerr_intr,
SA_INTERRUPT
,
+struct irqaction cpuerr_irq = { crime_cpuerr_intr,
IRQF_DISABLED
,
CPU_MASK_NONE, "CRIME CPU error", NULL, NULL };
/*
CPU_MASK_NONE, "CRIME CPU error", NULL, NULL };
/*
@@
-160,7
+160,7
@@
static void end_cpu_irq(unsigned int irq)
#define shutdown_cpu_irq disable_cpu_irq
#define mask_and_ack_cpu_irq disable_cpu_irq
#define shutdown_cpu_irq disable_cpu_irq
#define mask_and_ack_cpu_irq disable_cpu_irq
-static struct
hw_interrupt_type
ip32_cpu_interrupt = {
+static struct
irq_chip
ip32_cpu_interrupt = {
.typename = "IP32 CPU",
.startup = startup_cpu_irq,
.shutdown = shutdown_cpu_irq,
.typename = "IP32 CPU",
.startup = startup_cpu_irq,
.shutdown = shutdown_cpu_irq,
@@
-230,7
+230,7
@@
static void end_crime_irq(unsigned int irq)
#define shutdown_crime_irq disable_crime_irq
#define shutdown_crime_irq disable_crime_irq
-static struct
hw_interrupt_type
ip32_crime_interrupt = {
+static struct
irq_chip
ip32_crime_interrupt = {
.typename = "IP32 CRIME",
.startup = startup_crime_irq,
.shutdown = shutdown_crime_irq,
.typename = "IP32 CRIME",
.startup = startup_crime_irq,
.shutdown = shutdown_crime_irq,
@@
-289,7
+289,7
@@
static void end_macepci_irq(unsigned int irq)
#define shutdown_macepci_irq disable_macepci_irq
#define mask_and_ack_macepci_irq disable_macepci_irq
#define shutdown_macepci_irq disable_macepci_irq
#define mask_and_ack_macepci_irq disable_macepci_irq
-static struct
hw_interrupt_type
ip32_macepci_interrupt = {
+static struct
irq_chip
ip32_macepci_interrupt = {
.typename = "IP32 MACE PCI",
.startup = startup_macepci_irq,
.shutdown = shutdown_macepci_irq,
.typename = "IP32 MACE PCI",
.startup = startup_macepci_irq,
.shutdown = shutdown_macepci_irq,
@@
-419,7
+419,7
@@
static void end_maceisa_irq(unsigned irq)
#define shutdown_maceisa_irq disable_maceisa_irq
#define shutdown_maceisa_irq disable_maceisa_irq
-static struct
hw_interrupt_type
ip32_maceisa_interrupt = {
+static struct
irq_chip
ip32_maceisa_interrupt = {
.typename = "IP32 MACE ISA",
.startup = startup_maceisa_irq,
.shutdown = shutdown_maceisa_irq,
.typename = "IP32 MACE ISA",
.startup = startup_maceisa_irq,
.shutdown = shutdown_maceisa_irq,
@@
-469,7
+469,7
@@
static void end_mace_irq(unsigned int irq)
#define shutdown_mace_irq disable_mace_irq
#define mask_and_ack_mace_irq disable_mace_irq
#define shutdown_mace_irq disable_mace_irq
#define mask_and_ack_mace_irq disable_mace_irq
-static struct
hw_interrupt_type
ip32_mace_interrupt = {
+static struct
irq_chip
ip32_mace_interrupt = {
.typename = "IP32 MACE",
.startup = startup_mace_irq,
.shutdown = shutdown_mace_irq,
.typename = "IP32 MACE",
.startup = startup_mace_irq,
.shutdown = shutdown_mace_irq,
@@
-575,7
+575,7
@@
void __init arch_init_irq(void)
mace->perif.ctrl.imask = 0;
for (irq = 0; irq <= IP32_IRQ_MAX; irq++) {
mace->perif.ctrl.imask = 0;
for (irq = 0; irq <= IP32_IRQ_MAX; irq++) {
-
hw_irq_controller
*controller;
+
struct irq_chip
*controller;
if (irq == IP32_R4K_TIMER_IRQ)
controller = &ip32_cpu_interrupt;
if (irq == IP32_R4K_TIMER_IRQ)
controller = &ip32_cpu_interrupt;
@@
-591,7
+591,7
@@
void __init arch_init_irq(void)
irq_desc[irq].status = IRQ_DISABLED;
irq_desc[irq].action = 0;
irq_desc[irq].depth = 0;
irq_desc[irq].status = IRQ_DISABLED;
irq_desc[irq].action = 0;
irq_desc[irq].depth = 0;
- irq_desc[irq].
handler
= controller;
+ irq_desc[irq].
chip
= controller;
}
setup_irq(CRIME_MEMERR_IRQ, &memerr_irq);
setup_irq(CRIME_CPUERR_IRQ, &cpuerr_irq);
}
setup_irq(CRIME_MEMERR_IRQ, &memerr_irq);
setup_irq(CRIME_CPUERR_IRQ, &cpuerr_irq);