Re: sparc64 build breakage...

From: David Miller
Date: Wed Jan 21 2009 - 20:25:03 EST


From: David Miller <davem@xxxxxxxxxxxxx>
Date: Wed, 21 Jan 2009 17:15:53 -0800 (PST)

>
> This change:
>
> commit d7e51e66899f95dabc89b4d4c6674a6e50fa37fc
> Author: Yinghai Lu <yinghai@xxxxxxxxxx>
> Date: Wed Jan 7 15:03:13 2009 -0800
>
> sparseirq: make some func to be used with genirq
>
> breaks the sparc64 build:
..
> This should fix it:
>
> sparc64: Fix build by using kstat_irqs_cpu().

And here is a mix for the next failure.

But really, either linux/kernel_stat.h provides the
kstat_incr_irqs_this_cpu interface or linux/irq.h does, not both.

sparc64: Fix build by including linux/irq.h into time_64.c

Changeset d7e51e66899f95dabc89b4d4c6674a6e50fa37fc ("sparseirq: make
some func to be used with genirq") broke the build on sparc64:

arch/sparc/kernel/time_64.c: In function âtimer_interruptâ:
arch/sparc/kernel/time_64.c:732: error: implicit declaration of function âkstat_incr_irqs_this_cpuâ
make[1]: *** [arch/sparc/kernel/time_64.o] Error 1

Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c
index db310aa..f95066b 100644
--- a/arch/sparc/kernel/time_64.c
+++ b/arch/sparc/kernel/time_64.c
@@ -36,10 +36,10 @@
#include <linux/clocksource.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
+#include <linux/irq.h>

#include <asm/oplib.h>
#include <asm/timer.h>
-#include <asm/irq.h>
#include <asm/io.h>
#include <asm/prom.h>
#include <asm/starfire.h>
èº{.nÇ+‰·Ÿ®‰­†+%ŠËlzwm…ébëæìr¸›zX§»®w¥Š{ayºÊÚë,j­¢f£¢·hš‹àz¹®w¥¢¸ ¢·¦j:+v‰¨ŠwèjØm¶Ÿÿ¾«‘êçzZ+ƒùšŽŠÝj"ú!¶iO•æ¬z·švØ^¶m§ÿðà nÆàþY&—