lkml.org 
[lkml]   [2019]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip: perf/core] perf/ring_buffer: Modify the parameter type of perf_mmap_free_page()
The following commit has been merged into the perf/core branch of tip:

Commit-ID: 8a9f91c51ea72b126864e0db616b1bac12261200
Gitweb: https://git.kernel.org/tip/8a9f91c51ea72b126864e0db616b1bac12261200
Author: Yunfeng Ye <yeyunfeng@huawei.com>
AuthorDate: Mon, 14 Oct 2019 16:14:59 +08:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Thu, 17 Oct 2019 21:31:55 +02:00

perf/ring_buffer: Modify the parameter type of perf_mmap_free_page()

In perf_mmap_free_page(), the unsigned long type is converted to the
pointer type, but where the call is made, the pointer type is converted
to the unsigned long type. There is no need to do these operations.

Modify the parameter type of perf_mmap_free_page() to pointer type.

Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: <jolsa@redhat.co>
Cc: <acme@kernel.org>
Cc: <mingo@redhat.com>
Cc: <mark.rutland@arm.com>
Cc: <namhyung@kernel.org>
Cc: <alexander.shishkin@linux.intel.com>
Link: https://lkml.kernel.org/r/e6ae3f0c-d04c-50f9-544a-aee3b30330cd@huawei.com
---
kernel/events/ring_buffer.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index ffb59a4..abc145c 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -799,9 +799,9 @@ fail:
return NULL;
}

-static void perf_mmap_free_page(unsigned long addr)
+static void perf_mmap_free_page(void *addr)
{
- struct page *page = virt_to_page((void *)addr);
+ struct page *page = virt_to_page(addr);

page->mapping = NULL;
__free_page(page);
@@ -811,9 +811,9 @@ void rb_free(struct ring_buffer *rb)
{
int i;

- perf_mmap_free_page((unsigned long)rb->user_page);
+ perf_mmap_free_page(rb->user_page);
for (i = 0; i < rb->nr_pages; i++)
- perf_mmap_free_page((unsigned long)rb->data_pages[i]);
+ perf_mmap_free_page(rb->data_pages[i]);
kfree(rb);
}

\
 
 \ /
  Last update: 2019-10-18 14:49    [W:0.045 / U:3.388 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site