diff options
Diffstat (limited to 'kernel/trace/kmemtrace.c')
-rw-r--r-- | 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 f04c0625f1cd..256749d1032a 100644 --- a/kernel/trace/kmemtrace.c +++ b/kernel/trace/kmemtrace.c | |||
@@ -272,13 +272,11 @@ void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id, | |||
272 | struct ring_buffer_event *event; | 272 | struct ring_buffer_event *event; |
273 | struct kmemtrace_alloc_entry *entry; | 273 | struct kmemtrace_alloc_entry *entry; |
274 | struct trace_array *tr = kmemtrace_array; | 274 | struct trace_array *tr = kmemtrace_array; |
275 | unsigned long irq_flags; | ||
276 | 275 | ||
277 | if (!kmem_tracing_enabled) | 276 | if (!kmem_tracing_enabled) |
278 | return; | 277 | return; |
279 | 278 | ||
280 | event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry), | 279 | event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry)); |
281 | &irq_flags); | ||
282 | if (!event) | 280 | if (!event) |
283 | return; | 281 | return; |
284 | entry = ring_buffer_event_data(event); | 282 | entry = ring_buffer_event_data(event); |
@@ -292,7 +290,7 @@ void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id, | |||
292 | entry->gfp_flags = gfp_flags; | 290 | entry->gfp_flags = gfp_flags; |
293 | entry->node = node; | 291 | entry->node = node; |
294 | 292 | ||
295 | ring_buffer_unlock_commit(tr->buffer, event, irq_flags); | 293 | ring_buffer_unlock_commit(tr->buffer, event); |
296 | 294 | ||
297 | trace_wake_up(); | 295 | trace_wake_up(); |
298 | } | 296 | } |
@@ -305,13 +303,11 @@ void kmemtrace_mark_free(enum kmemtrace_type_id type_id, | |||
305 | struct ring_buffer_event *event; | 303 | struct ring_buffer_event *event; |
306 | struct kmemtrace_free_entry *entry; | 304 | struct kmemtrace_free_entry *entry; |
307 | struct trace_array *tr = kmemtrace_array; | 305 | struct trace_array *tr = kmemtrace_array; |
308 | unsigned long irq_flags; | ||
309 | 306 | ||
310 | if (!kmem_tracing_enabled) | 307 | if (!kmem_tracing_enabled) |
311 | return; | 308 | return; |
312 | 309 | ||
313 | event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry), | 310 | event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry)); |
314 | &irq_flags); | ||
315 | if (!event) | 311 | if (!event) |
316 | return; | 312 | return; |
317 | entry = ring_buffer_event_data(event); | 313 | entry = ring_buffer_event_data(event); |
@@ -322,7 +318,7 @@ void kmemtrace_mark_free(enum kmemtrace_type_id type_id, | |||
322 | entry->call_site = call_site; | 318 | entry->call_site = call_site; |
323 | entry->ptr = ptr; | 319 | entry->ptr = ptr; |
324 | 320 | ||
325 | ring_buffer_unlock_commit(tr->buffer, event, irq_flags); | 321 | ring_buffer_unlock_commit(tr->buffer, event); |
326 | 322 | ||
327 | trace_wake_up(); | 323 | trace_wake_up(); |
328 | } | 324 | } |