From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Subject: [lttng-dev] [PATCH 09/15] lttng: remove perf_event_create_kernel_counter wrapper
Date: Wed, 30 Nov 2011 13:34:22 -0500 [thread overview]
Message-ID: <1322678068-5255-10-git-send-email-mathieu.desnoyers@efficios.com> (raw)
In-Reply-To: <1322678068-5255-1-git-send-email-mathieu.desnoyers@efficios.com>
Now that LTTng is in the kernel tree, we don't need to support
deprecated APIs from older kernels.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
---
.../staging/lttng/lttng-context-perf-counters.c | 9 ++---
drivers/staging/lttng/wrapper/perf.h | 32 --------------------
2 files changed, 4 insertions(+), 37 deletions(-)
delete mode 100644 drivers/staging/lttng/wrapper/perf.h
diff --git a/drivers/staging/lttng/lttng-context-perf-counters.c b/drivers/staging/lttng/lttng-context-perf-counters.c
index 9910066..713c4df 100644
--- a/drivers/staging/lttng/lttng-context-perf-counters.c
+++ b/drivers/staging/lttng/lttng-context-perf-counters.c
@@ -14,7 +14,6 @@
#include <linux/string.h>
#include "ltt-events.h"
#include "wrapper/ringbuffer/frontend_types.h"
-#include "wrapper/perf.h"
#include "ltt-tracer.h"
static
@@ -123,8 +122,8 @@ int __cpuinit lttng_perf_counter_cpu_hp_callback(struct notifier_block *nb,
switch (action) {
case CPU_ONLINE:
case CPU_ONLINE_FROZEN:
- pevent = wrapper_perf_event_create_kernel_counter(attr,
- cpu, NULL, overflow_callback);
+ pevent = perf_event_create_kernel_counter(attr,
+ cpu, NULL, overflow_callback, NULL);
if (!pevent || IS_ERR(pevent))
return NOTIFY_BAD;
if (pevent->state == PERF_EVENT_STATE_ERROR) {
@@ -211,8 +210,8 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
get_online_cpus();
for_each_online_cpu(cpu) {
- events[cpu] = wrapper_perf_event_create_kernel_counter(attr,
- cpu, NULL, overflow_callback);
+ events[cpu] = perf_event_create_kernel_counter(attr,
+ cpu, NULL, overflow_callback, NULL);
if (!events[cpu] || IS_ERR(events[cpu])) {
ret = -EINVAL;
goto counter_error;
diff --git a/drivers/staging/lttng/wrapper/perf.h b/drivers/staging/lttng/wrapper/perf.h
deleted file mode 100644
index 9a6dbfc..0000000
--- a/drivers/staging/lttng/wrapper/perf.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _LTT_WRAPPER_PERF_H
-#define _LTT_WRAPPER_PERF_H
-
-/*
- * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers at efficios.com)
- *
- * Dual LGPL v2.1/GPL v2 license.
- */
-
-#include <linux/perf_event.h>
-
-#if defined(CONFIG_PERF_EVENTS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,99))
-static inline struct perf_event *
-wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr,
- int cpu,
- struct task_struct *task,
- perf_overflow_handler_t callback)
-{
- return perf_event_create_kernel_counter(attr, cpu, task, callback, NULL);
-}
-#else
-static inline struct perf_event *
-wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr,
- int cpu,
- struct task_struct *task,
- perf_overflow_handler_t callback)
-{
- return perf_event_create_kernel_counter(attr, cpu, task, callback);
-}
-#endif
-
-#endif /* _LTT_WRAPPER_PERF_H */
--
1.7.5.4
next prev parent reply other threads:[~2011-11-30 18:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-30 18:34 [lttng-dev] LTTng wrapper cleanup Mathieu Desnoyers
2011-11-30 18:34 ` [lttng-dev] [PATCH 01/15] lttng lib: ring buffer: remove stale null-pointer Mathieu Desnoyers
2011-11-30 18:34 ` [lttng-dev] [PATCH 02/15] lttng lib: ring buffer remove duplicate null pointer Mathieu Desnoyers
2011-11-30 18:34 ` [lttng-dev] [PATCH 03/15] lttng lib: ring buffer move null pointer check to open Mathieu Desnoyers
2011-11-30 18:34 ` [lttng-dev] [PATCH 04/15] Export vmalloc_sync_all symbol to GPL modules Mathieu Desnoyers
2011-11-30 18:34 ` [lttng-dev] [PATCH 05/15] lttng wrapper: add missing include to kallsyms wrapper Mathieu Desnoyers
2011-11-30 18:34 ` [lttng-dev] [PATCH 06/15] Remove LTTng vmalloc_sync_all wrapper Mathieu Desnoyers
2011-11-30 18:34 ` [lttng-dev] [PATCH 07/15] fs/splice: export splice_to_pipe to modules Mathieu Desnoyers
2011-11-30 18:34 ` [lttng-dev] [PATCH 08/15] lttng: remove splice_to_pipe wrapper Mathieu Desnoyers
2011-11-30 18:34 ` Mathieu Desnoyers [this message]
2011-11-30 18:34 ` [lttng-dev] [PATCH 10/15] lttng: remove ftrace function tracer support (but keep Mathieu Desnoyers
2011-11-30 18:34 ` [lttng-dev] [PATCH 11/15] lttng: remove raw spinlock wrapper Mathieu Desnoyers
2011-11-30 18:34 ` [lttng-dev] [PATCH 12/15] lttng: remove uuid wrapper Mathieu Desnoyers
2011-11-30 18:34 ` [lttng-dev] [PATCH 13/15] Export task_prio to modules Mathieu Desnoyers
2011-11-30 18:34 ` [lttng-dev] [PATCH 14/15] lttng: remove task_prio wrapper Mathieu Desnoyers
2011-11-30 18:34 ` [lttng-dev] [PATCH 15/15] lttng: remove kallsyms wrapper Mathieu Desnoyers
2011-11-30 18:47 ` [lttng-dev] LTTng wrapper cleanup Greg KH
2011-11-30 19:13 ` Mathieu Desnoyers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1322678068-5255-10-git-send-email-mathieu.desnoyers@efficios.com \
--to=mathieu.desnoyers@efficios.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox