linux-next: build failure after merge of the dma-mapping-fixes tree

linux-next: build failure after merge of the dma-mapping-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1428 bytes --]

Hi all,

After merging the dma-mapping-fixes tree, today's linux-next build
(x86_64 allmodconfig) failed like this:

/home/sfr/next/next/mm/migrate.c: In function 'migrate_vma_collect':
/home/sfr/next/next/mm/migrate.c:2350:61: error: 'mm_walk' undeclared (first use in this function)
  mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, NULL, mm_walk.mm,
                                                             ^~~~~~~

Caused by commit

  f4c1f66bf710 ("pagewalk: seperate function pointers from iterator data")

I have applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Aug 2019 08:25:40 +1000
Subject: [PATCH] pagewalk: fix up missed conversion in migrate_vma_collect()

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 mm/migrate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/migrate.c b/mm/migrate.c
index 75de4378dfcd..585113d2e37d 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -2347,7 +2347,7 @@ static void migrate_vma_collect(struct migrate_vma *migrate)
 {
 	struct mmu_notifier_range range;
 
-	mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, NULL, mm_walk.mm,
+	mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, NULL, migrate->vma->vm_mm,
 				migrate->start,
 				migrate->end);
 	mmu_notifier_invalidate_range_start(&range);
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the dma-mapping-fixes tree

[Christoph Hellwig]

On Thu, Aug 08, 2019 at 08:29:48AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the dma-mapping-fixes tree, today's linux-next build
> (x86_64 allmodconfig) failed like this:
> 
> /home/sfr/next/next/mm/migrate.c: In function 'migrate_vma_collect':
> /home/sfr/next/next/mm/migrate.c:2350:61: error: 'mm_walk' undeclared (first use in this function)
>   mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, NULL, mm_walk.mm,
>                                                              ^~~~~~~
> 
> Caused by commit
> 
>   f4c1f66bf710 ("pagewalk: seperate function pointers from iterator data")
> 
> I have applied the following patch for today:

That commit should not have been in that tree at all, let me check what
went wrong.

Re: linux-next: build failure after merge of the dma-mapping-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

Hi Christoph,

On Thu, 8 Aug 2019 00:37:22 +0200 Christoph Hellwig <hch@lst.de> wrote:
>
> That commit should not have been in that tree at all, let me check what
> went wrong.

I was wondering about that.  Now it has caused build problems further
along, so I have reverted the merge of the branch (along with my fix
up).

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]