Re: linux-next: manual merge of the tip tree with the drm tree
From: Dave Hansen <dave.hansen@linux.intel.com>
Date: 2016-03-17 16:52:46
Also in:
lkml
On 03/17/2016 02:00 AM, Arnd Bergmann wrote:
On Thursday 17 March 2016 13:00:29 Stephen Rothwell wrote:quoted
quoted
- r = get_user_pages(current, current->mm, userptr, num_pages, - write, 0, p, NULL); + r = get_user_pages(userptr, num_pages, write, 0, pages, NULL); + + spin_lock(>t->guptasklock); + list_del(&guptask.list); + spin_unlock(>t->guptasklock); + if (r < 0) goto release_pages;
...
quoted hunk ↗ jump to hunk
Your merge looks incorrect to me, and I got a build warning for it: drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_ttm_tt_get_user_pages': drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:535:17: error: unused variable 'p' [-Werror=unused-variable] I think the one-line change below is what is needed here, but it's probably best for amdgpu maintainers to take a closer look. Signed-off-by: Arnd Bergmann <arnd@arndb.de> index 8b9b245fd0c8..ab34190859a8 100644--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c@@ -540,7 +540,7 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages) list_add(&guptask.list, >t->guptasks); spin_unlock(>t->guptasklock); - r = get_user_pages(userptr, num_pages, write, 0, pages, NULL); + r = get_user_pages(userptr, num_pages, write, 0, p, NULL); spin_lock(>t->guptasklock); list_del(&guptask.list);
Yeah, Arnd's fix looks correct to me. The loop variable "pages" got renamed to "p" and another variable "pages" is now being passed into the function. The get_user_pages() call should be against 'p', the loop variable. Also, this is obvious if you consider that the pkeys patch was always just removing the first two arguments. We can see in Stephen's patch above that it both removes those arguments *and* replaces 'p' with 'pages'.