Commit 792fb4b7 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] IRQs: fix up irq_desc initialisation for non-ia32

The addition of more fields to irq_desc_t may have broken compilation of
other architectures.  Go through and C99ify them (was needed anyway).
parent 13c01fe7
...@@ -34,7 +34,10 @@ ...@@ -34,7 +34,10 @@
* Controller mappings for all interrupt sources: * Controller mappings for all interrupt sources:
*/ */
irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = { irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = {
[0 ... NR_IRQS-1] = { 0, &no_irq_type, NULL, 0, SPIN_LOCK_UNLOCKED} [0 ... NR_IRQS-1] = {
.handler = &no_irq_type,
.lock = SPIN_LOCK_UNLOCKED
}
}; };
static void register_irq_proc(unsigned int irq); static void register_irq_proc(unsigned int irq);
......
...@@ -65,8 +65,13 @@ ...@@ -65,8 +65,13 @@
/* /*
* Controller mappings for all interrupt sources: * Controller mappings for all interrupt sources:
*/ */
irq_desc_t _irq_desc[NR_IRQS] __cacheline_aligned = irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = {
{ [0 ... NR_IRQS-1] = { IRQ_DISABLED, &no_irq_type, NULL, 0, SPIN_LOCK_UNLOCKED}}; [0 ... NR_IRQS-1] = {
.status = IRQ_DISABLED,
.handler = &no_irq_type,
.lock = SPIN_LOCK_UNLOCKED
}
};
#ifdef CONFIG_IA64_GENERIC #ifdef CONFIG_IA64_GENERIC
struct irq_desc * __ia64_irq_desc (unsigned int irq) struct irq_desc * __ia64_irq_desc (unsigned int irq)
......
...@@ -24,8 +24,12 @@ ...@@ -24,8 +24,12 @@
/* /*
* Controller mappings for all interrupt sources: * Controller mappings for all interrupt sources:
*/ */
irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = {
{ [0 ... NR_IRQS-1] = { 0, &no_irq_type, NULL, 0, SPIN_LOCK_UNLOCKED}}; [0 ... NR_IRQS-1] = {
.handler = &no_irq_type,
.lock = SPIN_LOCK_UNLOCKED
}
};
/* /*
* Special irq handlers. * Special irq handlers.
......
...@@ -66,8 +66,12 @@ static void register_irq_proc (unsigned int irq); ...@@ -66,8 +66,12 @@ static void register_irq_proc (unsigned int irq);
#define MAXCOUNT 10000000 #define MAXCOUNT 10000000
irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = {
{ [0 ... NR_IRQS-1] = { 0, NULL, NULL, 0, SPIN_LOCK_UNLOCKED}}; [0 ... NR_IRQS-1] = {
.handler = &no_irq_type,
.lock = SPIN_LOCK_UNLOCKED
}
};
int ppc_spurious_interrupts = 0; int ppc_spurious_interrupts = 0;
struct irqaction *ppc_irq_action[NR_IRQS]; struct irqaction *ppc_irq_action[NR_IRQS];
......
...@@ -63,8 +63,11 @@ extern void iSeries_smp_message_recv( struct pt_regs * ); ...@@ -63,8 +63,11 @@ extern void iSeries_smp_message_recv( struct pt_regs * );
volatile unsigned char *chrp_int_ack_special; volatile unsigned char *chrp_int_ack_special;
static void register_irq_proc (unsigned int irq); static void register_irq_proc (unsigned int irq);
irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = {
{ [0 ... NR_IRQS-1] = { 0, NULL, NULL, 0, SPIN_LOCK_UNLOCKED}}; [0 ... NR_IRQS-1] = {
.lock = SPIN_LOCK_UNLOCKED
}
};
int ppc_spurious_interrupts = 0; int ppc_spurious_interrupts = 0;
unsigned long lpEvent_count = 0; unsigned long lpEvent_count = 0;
......
...@@ -41,8 +41,11 @@ ...@@ -41,8 +41,11 @@
/* /*
* Controller mappings for all interrupt sources: * Controller mappings for all interrupt sources:
*/ */
irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = {
{ [0 ... NR_IRQS-1] = { 0, &no_irq_type, }}; [0 ... NR_IRQS-1] = {
.handler = &no_irq_type,
}
};
/* /*
* Special irq handlers. * Special irq handlers.
......
...@@ -31,8 +31,12 @@ ...@@ -31,8 +31,12 @@
static void register_irq_proc (unsigned int irq); static void register_irq_proc (unsigned int irq);
irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = {
{ [0 ... NR_IRQS-1] = { 0, &no_irq_type, NULL, 0, SPIN_LOCK_UNLOCKED}}; [0 ... NR_IRQS-1] = {
.handler = &no_irq_type,
.lock = SPIN_LOCK_UNLOCKED
}
};
/* /*
* Generic no controller code * Generic no controller code
......
...@@ -28,8 +28,12 @@ ...@@ -28,8 +28,12 @@
/* /*
* Controller mappings for all interrupt sources: * Controller mappings for all interrupt sources:
*/ */
irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = {
{ [0 ... NR_IRQS-1] = { 0, &no_irq_type, NULL, 0, SPIN_LOCK_UNLOCKED}}; [0 ... NR_IRQS-1] = {
.handler = &no_irq_type,
.lock = SPIN_LOCK_UNLOCKED
}
};
/* /*
* Special irq handlers. * Special irq handlers.
......
...@@ -65,8 +65,12 @@ ...@@ -65,8 +65,12 @@
/* /*
* Controller mappings for all interrupt sources: * Controller mappings for all interrupt sources:
*/ */
irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = {
{ [0 ... NR_IRQS-1] = { 0, &no_irq_type, NULL, 0, SPIN_LOCK_UNLOCKED}}; [0 ... NR_IRQS-1] = {
.handler = &no_irq_type,
.lock = SPIN_LOCK_UNLOCKED
}
};
static void register_irq_proc (unsigned int irq); static void register_irq_proc (unsigned int irq);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment