linux-next: build failure after merge of the akpm tree

[Stephen Rothwell]

Hi all,

After merging the akpm 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:117:2: error: implicit 
declaration of function 'use_mm' [-Werror=implicit-function-declaration]
  117 |  use_mm(mm);
      |  ^~~~~~
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c:144:2: error: implicit 
declaration of function 'unuse_mm' [-Werror=implicit-function-declaration]
  144 |  unuse_mm(mm);
      |  ^~~~~~~~

Caused by commit

  d21760f76006 ("kernel: better document the use_mm/unuse_mm API contract")

interacting with commit

  522b89c63370 ("drm/amdkfd: Track SDMA utilization per process")

from the amdgpu tree.

I have added the following patch for today:

rom: Stephen Rothwell <s...@canb.auug.org.au>
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 <s...@canb.auug.org.au>
---
 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

pgp5IQvYXB2VF.pgp
Description: OpenPGP digital signature