Merge branch 'linus' into irq/threaded

Conflicts:
	include/linux/irq.h
	kernel/irq/handle.c

1 files changed, 31 insertions, 0 deletions

diff --git a/kernel/trace/trace_event_profile.c b/kernel/trace/trace_event_profile.c
new file mode 100644
index 00000000000..22cba997077
--- /dev/null
+++ b/kernel/trace/trace_event_profile.c
@@ -0,0 +1,31 @@
+/*
+ * trace event based perf counter profiling
+ *
+ * Copyright (C) 2009 Red Hat Inc, Peter Zijlstra <pzijlstr@redhat.com>
+ *
+ */
+
+#include "trace.h"
+
+int ftrace_profile_enable(int event_id)
+{
+        struct ftrace_event_call *event;
+
+        for_each_event(event) {
+                if (event->id == event_id)
+                        return event->profile_enable(event);
+        }
+
+        return -EINVAL;
+}
+
+void ftrace_profile_disable(int event_id)
+{
+        struct ftrace_event_call *event;
+
+        for_each_event(event) {
+                if (event->id == event_id)
+                        return event->profile_disable(event);
+        }
+}
+