From: Thomas Gleixner Signed-off-by: Thomas Gleixner Cc: Andi Kleen Signed-off-by: Andrew Morton --- arch/i386/kernel/i8259.c | 6 +++++- arch/i386/mach-default/setup.c | 6 +++++- arch/i386/mach-voyager/setup.c | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff -puN arch/i386/kernel/i8259.c~i386-cleanup-struct-irqaction-initializers arch/i386/kernel/i8259.c --- a/arch/i386/kernel/i8259.c~i386-cleanup-struct-irqaction-initializers +++ a/arch/i386/kernel/i8259.c @@ -350,7 +350,11 @@ static irqreturn_t math_error_irq(int cp * New motherboards sometimes make IRQ 13 be a PCI interrupt, * so allow interrupt sharing. */ -static struct irqaction fpu_irq = { math_error_irq, 0, CPU_MASK_NONE, "fpu", NULL, NULL }; +static struct irqaction fpu_irq = { + .handler = math_error_irq, + .mask = CPU_MASK_NONE, + .name = "fpu", +}; void __init init_ISA_irqs (void) { diff -puN arch/i386/mach-default/setup.c~i386-cleanup-struct-irqaction-initializers arch/i386/mach-default/setup.c --- a/arch/i386/mach-default/setup.c~i386-cleanup-struct-irqaction-initializers +++ a/arch/i386/mach-default/setup.c @@ -35,7 +35,11 @@ void __init pre_intr_init_hook(void) /* * IRQ2 is cascade interrupt to second interrupt controller */ -static struct irqaction irq2 = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL}; +static struct irqaction irq2 = { + .handler = no_action, + .mask = CPU_MASK_NONE, + .name = "cascade", +}; /** * intr_init_hook - post gate setup interrupt initialisation diff -puN arch/i386/mach-voyager/setup.c~i386-cleanup-struct-irqaction-initializers arch/i386/mach-voyager/setup.c --- a/arch/i386/mach-voyager/setup.c~i386-cleanup-struct-irqaction-initializers +++ a/arch/i386/mach-voyager/setup.c @@ -19,7 +19,11 @@ void __init pre_intr_init_hook(void) /* * IRQ2 is cascade interrupt to second interrupt controller */ -static struct irqaction irq2 = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL}; +static struct irqaction irq2 = { + .handler = no_action, + .mask = CPU_MASK_NONE, + .name = "cascade", +}; void __init intr_init_hook(void) { _