Re: linux-next: manual merge of the tip tree with the drm tree
From: Stephen Rothwell <hidden>
Date: 2016-03-17 09:39:16
Also in:
lkml
Hi Arnd, On Thu, 17 Mar 2016 10:00:56 +0100 Arnd Bergmann [off-list ref] wrote:
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);
Ah, there was another commit to this area (I stopped looking to soon):
2f568dbd6b94 ("drm/amdgpu: move get_user_pages out of amdgpu_ttm_tt_pin_userptr v6")
Your resolution certainly looks better. I'll do that tomorrow.
--
Cheers,
Stephen Rothwell