: Fix sparc64 build.
David Miller
maintainerPATCH 1/1 : Fix sparc64 build.
Ingo, didn't we fix this (a few times)? :-)
Linus, please apply:
sparc64: Fix build of timer_interrupt().
arch/sparc/kernel/time_64.c: In function ‘timer_interrupt’:arch/sparc/kernel/time_64.c:732: error: ‘struct kernel_stat’ has no member named ‘irqs’ make[1]: *** [arch/sparc/kernel/time_64.o] Error 1
arch/sparc/kernel/time_64.c +3 -1
@@ -724,12 +724,14 @@ void timer_interrupt(int irq, struct pt_regs *regs)unsigned long tick_mask = tick_ops->softint_mask;int cpu =smp_processor_id ();struct clock_event_device *evt = &per_cpu (sparc64_events, cpu); +struct irq_desc *desc;clear_softint (tick_mask);irq_enter (); - kstat_this_cpu.irqs[0 ]++; + desc =irq_to_desc (0 ); +kstat_incr_irqs_this_cpu (0 , desc);if (unlikely (!evt->event_handler)) { printk(KERN_WARNING
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
Quoted 10 lines · David Miller
Ingo, didn't we fix this (a few times)? :-)
Linus, please apply:
sparc64: Fix build of
timer_interrupt().
arch/sparc/kernel/time_64.c: In function ‘timer_interrupt’:arch/sparc/kernel/time_64.c:732: error: ‘struct kernel_stat’ has no member named ‘irqs’ make[1]: *** [arch/sparc/kernel/time_64.o] Error 1
Oops, sorry! Note that the fix is in a pending pull request (but this still does not make it right that i cut trees with this not in it).
I did check sparc for that particular pull request:
aldebaran:~/linux/linux> ./m-arch-all
[...]
testing sparc: -git: pass ( 2), -tip: pass ( 2)
So once the pieces are together again, it should all be fine.
Ingo