aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-16 04:26:38 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:04 -0400
commite5f717812982c7b2a20d5f2d897f7cce6db9c5e6 (patch)
tree2eb8bf2ea24c591bcac2e588f8bca654561514d6
parent0ac15559150a20d39d381a6be44cdea373584222 (diff)
CRIS: cleanup struct irqaction initializers
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Mikael Starvik <starvik@axis.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/cris/arch-v10/kernel/time.c8
-rw-r--r--arch/cris/arch-v32/kernel/smp.c8
2 files changed, 12 insertions, 4 deletions
diff --git a/arch/cris/arch-v10/kernel/time.c b/arch/cris/arch-v10/kernel/time.c
index 077e973c33f0..575a14bb1106 100644
--- a/arch/cris/arch-v10/kernel/time.c
+++ b/arch/cris/arch-v10/kernel/time.c
@@ -254,8 +254,12 @@ timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
254 * it needs to be IRQF_DISABLED to make the jiffies update work properly 254 * it needs to be IRQF_DISABLED to make the jiffies update work properly
255 */ 255 */
256 256
257static struct irqaction irq2 = { timer_interrupt, IRQF_SHARED | IRQF_DISABLED, 257static struct irqaction irq2 = {
258 CPU_MASK_NONE, "timer", NULL, NULL}; 258 .handler = timer_interrupt,
259 .flags = IRQF_SHARED | IRQF_DISABLED,
260 .mask = CPU_MASK_NONE,
261 .name = "timer",
262};
259 263
260void __init 264void __init
261time_init(void) 265time_init(void)
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c
index 77e655f26560..697494bc2de1 100644
--- a/arch/cris/arch-v32/kernel/smp.c
+++ b/arch/cris/arch-v32/kernel/smp.c
@@ -63,8 +63,12 @@ static unsigned long irq_regs[NR_CPUS] =
63 63
64static irqreturn_t crisv32_ipi_interrupt(int irq, void *dev_id, struct pt_regs *regs); 64static irqreturn_t crisv32_ipi_interrupt(int irq, void *dev_id, struct pt_regs *regs);
65static int send_ipi(int vector, int wait, cpumask_t cpu_mask); 65static int send_ipi(int vector, int wait, cpumask_t cpu_mask);
66static struct irqaction irq_ipi = { crisv32_ipi_interrupt, IRQF_DISABLED, 66static struct irqaction irq_ipi = {
67 CPU_MASK_NONE, "ipi", NULL, NULL}; 67 .handler = crisv32_ipi_interrupt,
68 .flags = IRQF_DISABLED,
69 .mask = CPU_MASK_NONE,
70 .name = "ipi",
71};
68 72
69extern void cris_mmu_init(void); 73extern void cris_mmu_init(void);
70extern void cris_timer_init(void); 74extern void cris_timer_init(void);