linux-kernel - [PATCH 1/2] perf_counter: cleanup kernel perf counter support for tracepoints

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <8fb0db1f14501b8a4b5c38374fc84c5ac03bd5aa.1246912068.git.jbaron@redhat.com>
Date:	Mon, 6 Jul 2009 17:11:57 -0400
From:	Jason Baron <jbaron@...hat.com>
To:	mingo@...e.hu
Cc:	linux-kernel@...r.kernel.org, paulus@...ba.org,
	a.p.zijlstra@...llo.nl, rostedt@...dmis.org, fweisbec@...il.com
Subject: [PATCH 1/2] perf_counter: cleanup kernel perf counter support for tracepoints



cleanup EVENT_PROFILE support to that it compiles and support tracepoint tracing
from the 'perf' tool. 


Signed-off-by: Jason Baron <jbaron@...hat.com>


---
 init/Kconfig          |    2 +-
 kernel/perf_counter.c |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/init/Kconfig b/init/Kconfig
index 0e8784e..13473ac 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -955,7 +955,7 @@ config PERF_COUNTERS
 
 config EVENT_PROFILE
 	bool "Tracepoint profile sources"
-	depends on PERF_COUNTERS && EVENT_TRACER
+	depends on PERF_COUNTERS && EVENT_TRACING
 	default y
 
 endmenu
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index d55a50d..a6d9759 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -3671,7 +3671,7 @@ static const struct pmu perf_ops_task_clock = {
 void perf_tpcounter_event(int event_id)
 {
 	struct perf_sample_data data = {
-		.regs = get_irq_regs();
+		.regs = get_irq_regs(),
 		.addr = 0,
 	};
 
@@ -3687,12 +3687,12 @@ extern void ftrace_profile_disable(int);
 
 static void tp_perf_counter_destroy(struct perf_counter *counter)
 {
-	ftrace_profile_disable(perf_event_id(&counter->attr));
+	ftrace_profile_disable(counter->attr.config);
 }
 
 static const struct pmu *tp_perf_counter_init(struct perf_counter *counter)
 {
-	int event_id = perf_event_id(&counter->attr);
+	int event_id = counter->attr.config;
 	int ret;
 
 	ret = ftrace_profile_enable(event_id);
-- 
1.6.0.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/