Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (105 commits)
  ring-buffer: only enable ring_buffer_swap_cpu when needed
  ring-buffer: check for swapped buffers in start of committing
  tracing: report error in trace if we fail to swap latency buffer
  tracing: add trace_array_printk for internal tracers to use
  tracing: pass around ring buffer instead of tracer
  tracing: make tracing_reset safe for external use
  tracing: use timestamp to determine start of latency traces
  tracing: Remove mentioning of legacy latency_trace file from documentation
  tracing/filters: Defer pred allocation, fix memory leak
  tracing: remove users of tracing_reset
  tracing: disable buffers and synchronize_sched before resetting
  tracing: disable update max tracer while reading trace
  tracing: print out start and stop in latency traces
  ring-buffer: disable all cpu buffers when one finds a problem
  ring-buffer: do not count discarded events
  ring-buffer: remove ring_buffer_event_discard
  ring-buffer: fix ring_buffer_read crossing pages
  ring-buffer: remove unnecessary cpu_relax
  ring-buffer: do not swap buffers during a commit
  ring-buffer: do not reset while in a commit
  ...

1 files changed, 12 insertions, 5 deletions

diff --git a/kernel/trace/trace_stat.c b/kernel/trace/trace_stat.c
index aea321c82fa0..a4bb239eb987 100644
--- a/kernel/trace/trace_stat.c
+++ b/kernel/trace/trace_stat.c
@@ -49,7 +49,8 @@ static struct dentry		*stat_dir;
  * but it will at least advance closer to the next one
  * to be released.
  */
-static struct rb_node *release_next(struct rb_node *node)
+static struct rb_node *release_next(struct tracer_stat *ts,
+                                    struct rb_node *node)
 {
         struct stat_node *snode;
         struct rb_node *parent = rb_parent(node);
@@ -67,6 +68,8 @@ static struct rb_node *release_next(struct rb_node *node)
                         parent->rb_right = NULL;
 
                 snode = container_of(node, struct stat_node, node);
+                if (ts->stat_release)
+                        ts->stat_release(snode->stat);
                 kfree(snode);
 
                 return parent;
@@ -78,7 +81,7 @@ static void __reset_stat_session(struct stat_session *session)
         struct rb_node *node = session->stat_root.rb_node;
 
         while (node)
-                node = release_next(node);
+                node = release_next(session->ts, node);
 
         session->stat_root = RB_ROOT;
 }
@@ -200,17 +203,21 @@ static void *stat_seq_start(struct seq_file *s, loff_t *pos)
 {
         struct stat_session *session = s->private;
         struct rb_node *node;
+        int n = *pos;
         int i;
 
         /* Prevent from tracer switch or rbtree modification */
         mutex_lock(&session->stat_mutex);
 
         /* If we are in the beginning of the file, print the headers */
-        if (!*pos && session->ts->stat_headers)
-                return SEQ_START_TOKEN;
+        if (session->ts->stat_headers) {
+                if (n == 0)
+                        return SEQ_START_TOKEN;
+                n--;
+        }
 
         node = rb_first(&session->stat_root);
-        for (i = 0; node && i < *pos; i++)
+        for (i = 0; node && i < n; i++)
                 node = rb_next(node);
 
         return node;