Hi all,
After merging the amdgpu tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c: In function 'kfd_sdma_activity_worker':
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c:118:2: error: implicit declaration of function 'use_mm' [-Werror=implicit-function-declaration]
118 | use_mm(mm);
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c:145:2: error: implicit declaration of function 'unuse_mm' [-Werror=implicit-function-declaration]
145 | unuse_mm(mm);
| ^~~~~~~~
Caused by commit
32cb59f31362 ("drm/amdkfd: Track SDMA utilization per process")
interacting with commit
f5678e7f2ac3 ("kernel: better document the use_mm/unuse_mm API contract")
from Linus' tree.
I have applied the following merge fix for today (that was previously
part of the akpm tree).
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 28 May 2020 20:15:34 +1000
Subject: [PATCH] drm/amdkfd: fix up for {un}use_mm() rename
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index db010c5da144..25636789f3d3 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -114,7 +114,7 @@ static void kfd_sdma_activity_worker(struct work_struct *work)
return;
}
- use_mm(mm);
+ kthread_use_mm(mm);
dqm_lock(dqm);
@@ -141,7 +141,7 @@ static void kfd_sdma_activity_worker(struct work_struct *work)
}
dqm_unlock(dqm);
- unuse_mm(mm);
+ kthread_unuse_mm(mm);
mmput(mm);
}
--
2.26.2
--
Cheers,
Stephen Rothwell
Attachment:
pgpQ4VsxS5eaf.pgp
Description: OpenPGP digital signature
