From: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
To: mingo@elte.hu
Cc: rostedt@goodmis.org, compudj@krystal.dyndns.org,
fweisbec@gmail.com, penberg@cs.helsinki.fi,
paulmck@linux.vnet.ibm.com,
Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>,
linux-kernel@vger.kernel.org
Subject: [PATCH 7/7] kmemtrace: update usage of ring_buffer_lock_reserve()
Date: Mon, 23 Mar 2009 15:12:27 +0200 [thread overview]
Message-ID: <c56426665804da261115c2883818c5fea6b217b6.1237813499.git.eduard.munteanu@linux360.ro> (raw)
In-Reply-To: <161be9ca8a27b432c4a6ab79f47788c4521652ae.1237813499.git.eduard.munteanu@linux360.ro>
In-Reply-To: <cover.1237813499.git.eduard.munteanu@linux360.ro>
The ring buffer API has changed a bit and kmemtrace wasn't compiling
anymore. This fixes the issue and allows kmemtrace to build.
Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
---
kernel/trace/kmemtrace.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/kernel/trace/kmemtrace.c b/kernel/trace/kmemtrace.c
index 98e6f76..26ec3c3 100644
--- a/kernel/trace/kmemtrace.c
+++ b/kernel/trace/kmemtrace.c
@@ -59,10 +59,8 @@ static inline void kmemtrace_alloc(enum kmemtrace_type_id type_id,
struct ring_buffer_event *event;
struct kmemtrace_alloc_entry *entry;
struct trace_array *tr = kmemtrace_array;
- unsigned long irq_flags;
- event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry),
- &irq_flags);
+ event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry));
if (!event)
return;
entry = ring_buffer_event_data(event);
@@ -77,7 +75,7 @@ static inline void kmemtrace_alloc(enum kmemtrace_type_id type_id,
entry->gfp_flags = gfp_flags;
entry->node = node;
- ring_buffer_unlock_commit(tr->buffer, event, irq_flags);
+ ring_buffer_unlock_commit(tr->buffer, event);
trace_wake_up();
}
@@ -89,10 +87,8 @@ static inline void kmemtrace_free(enum kmemtrace_type_id type_id,
struct ring_buffer_event *event;
struct kmemtrace_free_entry *entry;
struct trace_array *tr = kmemtrace_array;
- unsigned long irq_flags;
- event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry),
- &irq_flags);
+ event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry));
if (!event)
return;
entry = ring_buffer_event_data(event);
@@ -103,7 +99,7 @@ static inline void kmemtrace_free(enum kmemtrace_type_id type_id,
entry->call_site = call_site;
entry->ptr = ptr;
- ring_buffer_unlock_commit(tr->buffer, event, irq_flags);
+ ring_buffer_unlock_commit(tr->buffer, event);
trace_wake_up();
}
--
1.6.0.6
next prev parent reply other threads:[~2009-03-23 13:14 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-23 13:12 [PATCH 0/7] kmemtrace & tracing updates Eduard - Gabriel Munteanu
2009-03-23 13:12 ` [PATCH 1/7] RCU: don't include unnecessary headers, allow kmemtrace w/ tracepoints Eduard - Gabriel Munteanu
2009-03-23 13:12 ` [PATCH 2/7] tracing: provide trace_seq_reserve() Eduard - Gabriel Munteanu
2009-03-23 13:12 ` [PATCH 3/7] tracing: add missing 'extern' keywords to trace_output.h Eduard - Gabriel Munteanu
2009-03-23 13:12 ` [PATCH 4/7] kmemtrace: use tracepoints Eduard - Gabriel Munteanu
2009-03-23 13:12 ` [PATCH 5/7] kmemtrace: kmemtrace_alloc() must fill type_id Eduard - Gabriel Munteanu
2009-03-23 13:12 ` [PATCH 6/7] kmemtrace: restore original tracing data binary format, improve ABI Eduard - Gabriel Munteanu
2009-03-23 13:12 ` Eduard - Gabriel Munteanu [this message]
2009-03-23 14:55 ` [PATCH 7/7] kmemtrace: update usage of ring_buffer_lock_reserve() Ingo Molnar
2009-03-24 8:31 ` Eduard - Gabriel Munteanu
2009-03-23 15:06 ` [PATCH 6/7] kmemtrace: restore original tracing data binary format, improve ABI Ingo Molnar
2009-03-23 15:19 ` [tip:tracing/kmemtrace] " Eduard - Gabriel Munteanu
2009-03-23 15:19 ` [tip:tracing/kmemtrace] kmemtrace: small cleanups Ingo Molnar
2009-04-03 10:37 ` [tip:tracing/kmemtrace-v2] kmemtrace: restore original tracing data binary format, improve ABI Eduard - Gabriel Munteanu
2009-04-03 10:37 ` [tip:tracing/kmemtrace-v2] kmemtrace: small cleanups Ingo Molnar
2009-03-23 15:19 ` [tip:tracing/kmemtrace] kmemtrace: kmemtrace_alloc() must fill type_id Eduard - Gabriel Munteanu
2009-04-03 10:36 ` [tip:tracing/kmemtrace-v2] " Eduard - Gabriel Munteanu
2009-03-23 15:18 ` [tip:tracing/kmemtrace] kmemtrace: use tracepoints Eduard - Gabriel Munteanu
2009-04-03 10:36 ` [tip:tracing/kmemtrace-v2] " Eduard - Gabriel Munteanu
2009-03-23 15:18 ` [tip:tracing/kmemtrace] tracing: add missing 'extern' keywords to trace_output.h Eduard - Gabriel Munteanu
2009-03-23 15:18 ` [tip:tracing/kmemtrace] tracing: provide trace_seq_reserve() Eduard - Gabriel Munteanu
2009-03-23 15:18 ` [tip:tracing/kmemtrace] rcu: don't include unnecessary headers, allow kmemtrace w/ tracepoints Eduard - Gabriel Munteanu
2009-03-23 15:29 ` [PATCH 0/7] kmemtrace & tracing updates Ingo Molnar
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=c56426665804da261115c2883818c5fea6b217b6.1237813499.git.eduard.munteanu@linux360.ro \
--to=eduard.munteanu@linux360.ro \
--cc=compudj@krystal.dyndns.org \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulmck@linux.vnet.ibm.com \
--cc=penberg@cs.helsinki.fi \
--cc=rostedt@goodmis.org \
/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
all inboxes | Powered by JetHome®