From: Thomas Gleixner Signed-off-by: Thomas Gleixner Cc: Mikael Starvik Signed-off-by: Andrew Morton --- arch/cris/arch-v10/kernel/time.c | 8 ++++++-- arch/cris/arch-v32/kernel/smp.c | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff -puN arch/cris/arch-v10/kernel/time.c~cris-cleanup-struct-irqaction-initializers arch/cris/arch-v10/kernel/time.c --- a/arch/cris/arch-v10/kernel/time.c~cris-cleanup-struct-irqaction-initializers +++ a/arch/cris/arch-v10/kernel/time.c @@ -254,8 +254,12 @@ timer_interrupt(int irq, void *dev_id, s * it needs to be IRQF_DISABLED to make the jiffies update work properly */ -static struct irqaction irq2 = { timer_interrupt, IRQF_SHARED | IRQF_DISABLED, - CPU_MASK_NONE, "timer", NULL, NULL}; +static struct irqaction irq2 = { + .handler = timer_interrupt, + .flags = IRQF_SHARED | IRQF_DISABLED, + .mask = CPU_MASK_NONE, + .name = "timer", +}; void __init time_init(void) diff -puN arch/cris/arch-v32/kernel/smp.c~cris-cleanup-struct-irqaction-initializers arch/cris/arch-v32/kernel/smp.c --- a/arch/cris/arch-v32/kernel/smp.c~cris-cleanup-struct-irqaction-initializers +++ a/arch/cris/arch-v32/kernel/smp.c @@ -63,8 +63,12 @@ static unsigned long irq_regs[NR_CPUS] = static irqreturn_t crisv32_ipi_interrupt(int irq, void *dev_id, struct pt_regs *regs); static int send_ipi(int vector, int wait, cpumask_t cpu_mask); -static struct irqaction irq_ipi = { crisv32_ipi_interrupt, IRQF_DISABLED, - CPU_MASK_NONE, "ipi", NULL, NULL}; +static struct irqaction irq_ipi = { + .handler = crisv32_ipi_interrupt, + .flags = IRQF_DISABLED, + .mask = CPU_MASK_NONE, + .name = "ipi", +}; extern void cris_mmu_init(void); extern void cris_timer_init(void); _