lkml.org 
[lkml]   [2023]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: linux-next: build failure after merge of the mips tree
On Mon, Mar 27, 2023 at 04:12:17PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the mips tree, today's linux-next build (mips
> cavium_octeon_defconfig) failed like this:
>
> arch/mips/cavium-octeon/octeon-irq.c:2893:35: error: assignment to ‘u64’ {aka ‘long long unsigned int’} from ‘void *’ makes integer from pointer without a cast [-Werror=int-conversion]
>
> (reported here: https://linux.kernelci.org/build/id/6420fc4409ffd05fb69c951a/logs/)
>
> Caused by commit
>
> ed6a0b6e9fd7 ("MIPS: octeon: Use of_address_to_resource()")

I've added below patch to fix the problem.

Thomas.

commit 101f26c72825c5dba1dfe826e4202a9a04b435c6
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date: Mon Mar 27 10:35:22 2023 +0200

MIPS: octeon: Fix compile error

Commit ed6a0b6e9fd7 ("MIPS: octeon: Use of_address_to_resource()") lost
a cast, which causes a compile error.

Fixes: ed6a0b6e9fd7 ("MIPS: octeon: Use of_address_to_resource()")
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c
index 064e2409377a..8425a6b38aa2 100644
--- a/arch/mips/cavium-octeon/octeon-irq.c
+++ b/arch/mips/cavium-octeon/octeon-irq.c
@@ -2890,7 +2890,7 @@ static int __init octeon_irq_init_ciu3(struct device_node *ciu_node,
if (WARN_ON(ret))
return ret;

- ciu3_info->ciu3_addr = base_addr = phys_to_virt(res.start);
+ ciu3_info->ciu3_addr = base_addr = (u64)phys_to_virt(res.start);
ciu3_info->node = node;

consts.u64 = cvmx_read_csr(base_addr + CIU3_CONST);

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]

\
 
 \ /
  Last update: 2023-03-27 11:32    [W:0.030 / U:0.840 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site