diff --git a/[refs] b/[refs] index a891f7698902..eedf22961060 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7dbdee2e9a2ac42ea5135801bcc9d1a8e3f672aa +refs/heads/master: bd3f02212d6a457267e0c9c02c426151c436d9d4 diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c index d4d3580a894a..a330513d96ce 100644 --- a/trunk/kernel/trace/ring_buffer.c +++ b/trunk/kernel/trace/ring_buffer.c @@ -735,6 +735,7 @@ ring_buffer_free(struct ring_buffer *buffer) put_online_cpus(); + kfree(buffer->buffers); free_cpumask_var(buffer->cpumask); kfree(buffer);