The patch titled
Subject: drm/amdgpu: use ERR_PTR() to return from amdgpu_mn_get
has been removed from the -mm tree. Its filename was
drm-amdgpu-make-amdgpu_mn_get-wait-for-mmap_sem-killable-fix.patch
This patch was dropped because it was folded into drm-amdgpu-make-amdgpu_mn_get-wait-for-mmap_sem-killable.patch
------------------------------------------------------
From: Arnd Bergmann <arnd@xxxxxxxx>
Subject: drm/amdgpu: use ERR_PTR() to return from amdgpu_mn_get
The newly added failure path in amdgpu_mn_get() use the
wrong return type:
drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c: In function 'amdgpu_mn_get':
drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c:237:10: error: return makes pointer from integer without a cast
This adds the necessary ERR_PTR() conversion.
Fixes: ad35eee9fb17 ("drm/amdgpu: make amdgpu_mn_get wait for mmap_sem killable")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c~drm-amdgpu-make-amdgpu_mn_get-wait-for-mmap_sem-killable-fix drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c~drm-amdgpu-make-amdgpu_mn_get-wait-for-mmap_sem-killable-fix
+++ a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
@@ -234,7 +234,7 @@ static struct amdgpu_mn *amdgpu_mn_get(s
mutex_lock(&adev->mn_lock);
if (down_write_killable(&mm->mmap_sem)) {
mutex_unlock(&adev->mn_lock);
- return -EINTR;
+ return ERR_PTR(-EINTR);
}
hash_for_each_possible(adev->mn_hash, rmn, node, (unsigned long)mm)
_
Patches currently in -mm which might be from arnd@xxxxxxxx are
drm-amdgpu-make-amdgpu_mn_get-wait-for-mmap_sem-killable.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
