From f9f88dca3b700bd4c811d01abba4ef5f68ad4dd2 Mon Sep 17 00:00:00 2001
From: Jason Baron <jbaron@redhat.com>
Date: Thu, 26 Feb 2009 10:11:05 -0500
Subject: [PATCH] --- yaml --- r: 140805 b: refs/heads/master c:
 af39241b90a345556b8884adff87096afe71b050 h: refs/heads/master i:   140803:
 2e8fa548bbfdf5bc6d7fe04bb45c647d4f1ed131 v: v3

---
 [refs]                                |  2 +-
 trunk/include/trace/irq.h             |  9 +++++++++
 trunk/include/trace/irq_event_types.h | 17 +++++++++++++++++
 trunk/kernel/irq/handle.c             |  6 ++++++
 trunk/kernel/trace/events.c           |  2 ++
 5 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 trunk/include/trace/irq.h
 create mode 100644 trunk/include/trace/irq_event_types.h

diff --git a/[refs] b/[refs]
index 849cf581d85e..9954e9b42910 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8656e7a2fa6afcd8682990f804a2a9674568738f
+refs/heads/master: af39241b90a345556b8884adff87096afe71b050
diff --git a/trunk/include/trace/irq.h b/trunk/include/trace/irq.h
new file mode 100644
index 000000000000..ff5d4495dc37
--- /dev/null
+++ b/trunk/include/trace/irq.h
@@ -0,0 +1,9 @@
+#ifndef _TRACE_IRQ_H
+#define _TRACE_IRQ_H
+
+#include <linux/interrupt.h>
+#include <linux/tracepoint.h>
+
+#include <trace/irq_event_types.h>
+
+#endif
diff --git a/trunk/include/trace/irq_event_types.h b/trunk/include/trace/irq_event_types.h
new file mode 100644
index 000000000000..5d0919fdd2d4
--- /dev/null
+++ b/trunk/include/trace/irq_event_types.h
@@ -0,0 +1,17 @@
+
+/* use <trace/irq.h> instead */
+#ifndef TRACE_FORMAT
+# error Do not include this file directly.
+# error Unless you know what you are doing.
+#endif
+
+TRACE_FORMAT(irq_handler_entry,
+	TPPROTO(int irq, struct irqaction *action),
+	TPARGS(irq, action),
+	TPFMT("irq=%d handler=%s", irq, action->name));
+
+TRACE_FORMAT(irq_handler_exit,
+	TPPROTO(int irq, struct irqaction *action, int ret),
+	TPARGS(irq, action, ret),
+	TPFMT("irq=%d handler=%s return=%s",
+		irq, action->name, ret ? "handled" : "unhandled"));
diff --git a/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c
index 3aba8d12f328..4709a7c870d7 100644
--- a/trunk/kernel/irq/handle.c
+++ b/trunk/kernel/irq/handle.c
@@ -17,6 +17,7 @@
 #include <linux/kernel_stat.h>
 #include <linux/rculist.h>
 #include <linux/hash.h>
+#include <trace/irq.h>
 
 #include "internals.h"
 
@@ -316,6 +317,9 @@ irqreturn_t no_action(int cpl, void *dev_id)
 	return IRQ_NONE;
 }
 
+DEFINE_TRACE(irq_handler_entry);
+DEFINE_TRACE(irq_handler_exit);
+
 /**
  * handle_IRQ_event - irq action chain handler
  * @irq:	the interrupt number
@@ -332,7 +336,9 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action)
 		local_irq_enable_in_hardirq();
 
 	do {
+		trace_irq_handler_entry(irq, action);
 		ret = action->handler(irq, action->dev_id);
+		trace_irq_handler_exit(irq, action, ret);
 		if (ret == IRQ_HANDLED)
 			status |= action->flags;
 		retval |= ret;
diff --git a/trunk/kernel/trace/events.c b/trunk/kernel/trace/events.c
index 38c89eef99ee..3c75623893cc 100644
--- a/trunk/kernel/trace/events.c
+++ b/trunk/kernel/trace/events.c
@@ -6,8 +6,10 @@
 
 /* trace/<type>.h here */
 #include <trace/sched.h>
+#include <trace/irq.h>
 
 #include "trace_events.h"
 
 /* trace/<type>_event_types.h here */
 #include <trace/sched_event_types.h>
+#include <trace/irq_event_types.h>