Merge branch 'work.vboxsf' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux.git] / kernel / trace / trace_hwlat.c

diff --git a/kernel/trace/trace_hwlat.c b/kernel/trace/trace_hwlat.c
index 6638d63f0921dfb1a58a4ce822e89f5daba255d9..a48808c4324917cb150f749a85b3474a57e23d83 100644 (file)
--- a/kernel/trace/trace_hwlat.c
+++ b/kernel/trace/trace_hwlat.c
@@ -104,7 +104,7 @@ static void trace_hwlat_sample(struct hwlat_sample *sample)
 {
        struct trace_array *tr = hwlat_trace;
        struct trace_event_call *call = &event_hwlat;
-       struct ring_buffer *buffer = tr->trace_buffer.buffer;
+       struct trace_buffer *buffer = tr->array_buffer.buffer;
        struct ring_buffer_event *event;
        struct hwlat_entry *entry;
        unsigned long flags;
@@ -556,7 +556,7 @@ static int init_tracefs(void)
        return 0;
 
  err:
-       tracefs_remove_recursive(top_dir);
+       tracefs_remove(top_dir);
        return -ENOMEM;
 }