diff options
| author | Roman Kiryanov <rkir@google.com> | 2020-03-25 14:21:20 -0700 |
|---|---|---|
| committer | Roman Kiryanov <rkir@google.com> | 2020-03-25 21:38:39 +0000 |
| commit | 78ac8c04905f4ecc36b50e425e50e93ad18a14b7 (patch) | |
| tree | b2d217590f654af033d886bb83ed245d36e8220e | |
| parent | 105380bf0da4bb4f3ad6561c77199d9205b80b81 (diff) | |
| download | goldfish-modules-78ac8c04905f4ecc36b50e425e50e93ad18a14b7.tar.gz | |
Rename pin_user_pages to goldfish_pin_user_pages
kernel.org introduced the pin_user_pages function
which collided with our function.
Bug: 152433832
Test: build
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I10ebdd6b93ff9bc1c0d1b50c1b45f6e65297206c
| -rw-r--r-- | goldfish_pipe_v2.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/goldfish_pipe_v2.c b/goldfish_pipe_v2.c index bf80291..5472908 100644 --- a/goldfish_pipe_v2.c +++ b/goldfish_pipe_v2.c @@ -293,12 +293,12 @@ static int goldfish_pipe_error_convert(int status) } } -static int pin_user_pages(unsigned long first_page, - unsigned long last_page, - unsigned int last_page_size, - int is_write, - struct page *pages[MAX_BUFFERS_PER_COMMAND], - unsigned int *iter_last_page_size) +static int goldfish_pin_user_pages(unsigned long first_page, + unsigned long last_page, + unsigned int last_page_size, + int is_write, + struct page *pages[MAX_BUFFERS_PER_COMMAND], + unsigned int *iter_last_page_size) { int ret; int requested_pages = ((last_page - first_page) >> PAGE_SHIFT) + 1; @@ -389,9 +389,12 @@ static int transfer_max_buffers(struct goldfish_pipe *pipe, if (mutex_lock_interruptible(&pipe->lock)) return -ERESTARTSYS; - pages_count = pin_user_pages(first_page, last_page, - last_page_size, is_write, - pipe->pages, &iter_last_page_size); + pages_count = goldfish_pin_user_pages(first_page, + last_page, + last_page_size, + is_write, + pipe->pages, + &iter_last_page_size); if (pages_count < 0) { mutex_unlock(&pipe->lock); return pages_count; |