From aadc7548e456cff3ecdf83960d3a893940769f22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 1 Dec 2009 15:05:01 -0500 Subject: [PATCH] --- yaml --- r: 169848 b: refs/heads/master c: ec70ccd806111ba3caf596def91a8580138b12db h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/perf_event.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6a6c4e05dac1..eb8e8eb1a7cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdad0db7dbdb37d0bb3c7d0f65cd3ff599ea6ecb +refs/heads/master: ec70ccd806111ba3caf596def91a8580138b12db diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c index 040ee517c808..6b7ddba1dd64 100644 --- a/trunk/kernel/perf_event.c +++ b/trunk/kernel/perf_event.c @@ -2210,6 +2210,7 @@ static void perf_mmap_data_free(struct perf_mmap_data *data) perf_mmap_free_page((unsigned long)data->user_page); for (i = 0; i < data->nr_pages; i++) perf_mmap_free_page((unsigned long)data->data_pages[i]); + kfree(data); } #else @@ -2250,6 +2251,7 @@ static void perf_mmap_data_free_work(struct work_struct *work) perf_mmap_unmark_page(base + (i * PAGE_SIZE)); vfree(base); + kfree(data); } static void perf_mmap_data_free(struct perf_mmap_data *data) @@ -2355,7 +2357,6 @@ static void perf_mmap_data_free_rcu(struct rcu_head *rcu_head) data = container_of(rcu_head, struct perf_mmap_data, rcu_head); perf_mmap_data_free(data); - kfree(data); } static void perf_mmap_data_release(struct perf_event *event)