Re: [sparc build bug] Re: [tip:perf/core] irq: Add tracepoint to softirq_raise

[Peter Zijlstra <peterz@infradead.org>]

On Mon, 2010-10-18 at 11:44 +0200, Peter Zijlstra wrote:
> On Wed, 2010-09-08 at 13:25 +0200, Ingo Molnar wrote:
> > * tip-bot for Lai Jiangshan <laijs@cn.fujitsu.com> wrote:
> > 
> > > Commit-ID:  2bf2160d8805de64308e2e7c3cd97813cb58ed2f
> > > Gitweb:     http://git.kernel.org/tip/2bf2160d8805de64308e2e7c3cd97813cb58ed2f
> > > Author:     Lai Jiangshan <laijs@cn.fujitsu.com>
> > > AuthorDate: Mon, 23 Aug 2010 18:42:48 +0900
> > > Committer:  Frederic Weisbecker <fweisbec@gmail.com>
> > > CommitDate: Tue, 7 Sep 2010 17:49:34 +0200
> > > 
> > > irq: Add tracepoint to softirq_raise
> > > 
> > > Add a tracepoint for tracing when softirq action is raised.
> > > 
> > > This and the existing tracepoints complete softirq's tracepoints:
> > > softirq_raise, softirq_entry and softirq_exit.
> > > 
> > > And when this tracepoint is used in combination with
> > > the softirq_entry tracepoint we can determine
> > > the softirq raise latency.
> > > 
> > > Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
> > > Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
> > > Acked-by: Neil Horman <nhorman@tuxdriver.com>
> > > Cc: David Miller <davem@davemloft.net>
> > > Cc: Kaneshige Kenji <kaneshige.kenji@jp.fujitsu.com>
> > > Cc: Izumo Taku <izumi.taku@jp.fujitsu.com>
> > > Cc: Kosaki Motohiro <kosaki.motohiro@jp.fujitsu.com>
> > > Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
> > > Cc: Scott Mcmillan <scott.a.mcmillan@intel.com>
> > > Cc: Steven Rostedt <rostedt@goodmis.org>
> > > Cc: Eric Dumazet <eric.dumazet@gmail.com>
> > > LKML-Reference: <4C724298.4050509@jp.fujitsu.com>
> > > [ factorize softirq events with DECLARE_EVENT_CLASS ]
> > > Signed-off-by: Koki Sanagi <sanagi.koki@jp.fujitsu.com>
> > > Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
> > > ---
> > >  include/linux/interrupt.h  |    8 +++++++-
> > >  include/trace/events/irq.h |   26 ++++++++++++++++++++++++--
> > >  2 files changed, 31 insertions(+), 3 deletions(-)
> > 

> I could build sparc64_defconfig, but s390 is broken for me by this...


the below makes s390 build again, not sure its completely safe for all
configs though...

Heiko?

---
 arch/s390/include/asm/hardirq.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/s390/include/asm/hardirq.h
b/arch/s390/include/asm/hardirq.h
index 498bc38..9558a71 100644
--- a/arch/s390/include/asm/hardirq.h
+++ b/arch/s390/include/asm/hardirq.h
@@ -15,7 +15,6 @@
 #include <linux/threads.h>
 #include <linux/sched.h>
 #include <linux/cache.h>
-#include <linux/interrupt.h>
 #include <asm/lowcore.h>
 
 #define local_softirq_pending() (S390_lowcore.softirq_pending)