Skip to contentSkip to conversation

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

DISCUSSION Stephen Rothwell 2 participants 3 messages Aug 27, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi all,

After merging the akpm-current tree, today's linux-next build (mips cavium_octeon_defconfig) failed like this:

arch/mips/cavium-octeon/dma-octeon.c:205:7: error: ‘mem’ undeclared (first use in this function); did you mean ‘sem’?

Caused by commit

52e1a745395d ("arch, drivers: replace for_each_membock() with for_each_mem_range()")

Reported by "kernelci.org bot" <[email protected]>.

Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw
Quoted 5 lines · Stephen Rothwell

Hi all,

After merging the akpm-current tree, today's linux-next build (mips cavium_octeon_defconfig) failed like this:

Quoted 7 lines

arch/mips/cavium-octeon/dma-octeon.c:205:7: error: ‘mem’ undeclared (first use in this function); did you mean ‘sem’?

Caused by commit

52e1a745395d ("arch, drivers: replace for_each_membock() with for_each_mem_range()")

Reported by "kernelci.org bot" <[email protected]>.

Here's the fix:

From 9e46da6793528e35883ff81835d65a864bf98007 Mon Sep 17 00:00:00 2001
From: Mike Rapoport <[email protected]>
Date: Thu, 27 Aug 2020 15:42:49 +0300
Subject: [PATCH] mips: fix cavium-octeon build caused by memblock refactoring
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MIPS cavium_octeon_defconfig build failed like this:

arch/mips/cavium-octeon/dma-octeon.c:205:7: error: ‘mem’ undeclared (first use in this function); did you mean ‘sem’?

Caused by patch ("arch, drivers: replace for_each_membock() with for_each_mem_range()")

Replacing stale 'mem->base' reference with 'start' fixes the issue.

Reported by "kernelci.org bot" <[email protected]>.

---
 arch/mips/cavium-octeon/dma-octeon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/cavium-octeon/dma-octeon.c +1 -1
index d938c1f7c1e1..ad1aecc4b401 100644
@@ -202,7 +202,7 @@ void __init plat_swiotlb_setup(void)
 
 	for_each_mem_range(i, &start, &end) {
 		/* These addresses map low for PCI. */
-		if (mem->base > 0x410000000ull && !OCTEON_IS_OCTEON2())
+		if (start > 0x410000000ull && !OCTEON_IS_OCTEON2())
 			continue;
 
 		addr_size += (end - start);
Signature · 1 line
2.26.2
#2 lore raw

Hi Mike,

Quoted 13 lines · On Thu, 27 Aug 2020 15:45:49 +0300 Mike Rapoport <[email protected]> wrote:
Quoted 11 lines · Stephen Rothwell

Hi all,

After merging the akpm-current tree, today's linux-next build (mips cavium_octeon_defconfig) failed like this:

arch/mips/cavium-octeon/dma-octeon.c:205:7: error: ‘mem’ undeclared (first use in this function); did you mean ‘sem’?

Caused by commit

52e1a745395d ("arch, drivers: replace for_each_membock() with for_each_mem_range()")

Quoted 8 lines
Quoted 1 line

Reported by "kernelci.org bot" <[email protected]>.

Here's the fix:

From 9e46da6793528e35883ff81835d65a864bf98007 Mon Sep 17 00:00:00 2001
From: Mike Rapoport <[email protected]>
Date: Thu, 27 Aug 2020 15:42:49 +0300
Subject: [PATCH] mips: fix cavium-octeon build caused by memblock refactoring

Thanks, I have added that to linux-next today.

Signature · 2 lines
Cheers,
Stephen Rothwell