Thread (3 messages) 3 messages, 3 authors, 2009-02-03

linux-next: build failure

From: Stephen Rothwell <hidden>
Date: 2009-02-02 09:02:58
Subsystem: sparc + ultrasparc (sparc/sparc64), the rest · Maintainers: "David S. Miller", Andreas Larsson, Linus Torvalds

Hi Dave, Ingo,

Today's linux-next build (sparc64 defconfig) failed like this:

arch/sparc/kernel/nmi.c: In function 'perfctr_irq':
arch/sparc/kernel/nmi.c:97: error: 'struct kernel_stat' has no member named 'irqs'

Probably caused by commit e5553a6d04421eec326a629571d696e8e745a0e4
("sparc64: Implement NMI watchdog on capable cpus") from the
sparc-current tree interacting with commit
d7e51e66899f95dabc89b4d4c6674a6e50fa37fc ("sparseirq: make some func to
be used with genirq") from the sparseirq tree.

I have temporarily applied the patch below.  I don't know if it is
correct (but it fixes the build).  If it is, it should be applicable to
the sparc-current tree as the needed interface exists in Linus' current
tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <redacted>
Date: Mon, 2 Feb 2009 20:00:15 +1100
Subject: [PATCH] sparc: fixup for sparseirq changes

Signed-off-by: Stephen Rothwell <redacted>
---
 arch/sparc/kernel/nmi.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c
index ffc6900..09f088e 100644
--- a/arch/sparc/kernel/nmi.c
+++ b/arch/sparc/kernel/nmi.c
@@ -94,7 +94,7 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs)
 		       pt_regs_trap_type(regs), SIGINT) == NOTIFY_STOP)
 		touched = 1;
 
-	sum = kstat_cpu(cpu).irqs[0];
+	sum = kstat_irqs_cpu(0, cpu);
 	if (__get_cpu_var(nmi_touch)) {
 		__get_cpu_var(nmi_touch) = 0;
 		touched = 1;
-- 
1.6.0.5
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help