ARM: mm: fix warning on phys_addr_t to void pointer assignment

Message ID 20221213191813.4054267-1-giulio.benetti@benettiengineering.com
State New
Headers
Series ARM: mm: fix warning on phys_addr_t to void pointer assignment |

Commit Message

Giulio Benetti Dec. 13, 2022, 7:18 p.m. UTC
  zero_page is a void* pointer but memblock_alloc() returns phys_addr_t type
so this generates a warning while using clang and with -Wint-error enabled
that becomes and error. So let's cast the return of memblock_alloc() to
(void *).

Cc: <stable@vger.kernel.org> # 4.14.x +
Fixes: 340a982825f7 ("ARM: 9266/1: mm: fix no-MMU ZERO_PAGE() implementation")
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
 arch/arm/mm/nommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Naresh Kamboju Dec. 28, 2022, 10:49 a.m. UTC | #1
On Wed, 14 Dec 2022 at 00:48, Giulio Benetti
<giulio.benetti@benettiengineering.com> wrote:
>
> zero_page is a void* pointer but memblock_alloc() returns phys_addr_t type
> so this generates a warning while using clang and with -Wint-error enabled
> that becomes and error. So let's cast the return of memblock_alloc() to
> (void *).
>
> Cc: <stable@vger.kernel.org> # 4.14.x +
> Fixes: 340a982825f7 ("ARM: 9266/1: mm: fix no-MMU ZERO_PAGE() implementation")
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>

Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>


> ---
>  arch/arm/mm/nommu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c
> index c1494a4dee25..53f2d8774fdb 100644
> --- a/arch/arm/mm/nommu.c
> +++ b/arch/arm/mm/nommu.c
> @@ -161,7 +161,7 @@ void __init paging_init(const struct machine_desc *mdesc)
>         mpu_setup();
>
>         /* allocate the zero page. */
> -       zero_page = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
> +       zero_page = (void *)memblock_alloc(PAGE_SIZE, PAGE_SIZE);
>         if (!zero_page)
>                 panic("%s: Failed to allocate %lu bytes align=0x%lx\n",
>                       __func__, PAGE_SIZE, PAGE_SIZE);
> --
> 2.34.1


--
Linaro LKFT
https://lkft.linaro.org
  

Patch

diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c
index c1494a4dee25..53f2d8774fdb 100644
--- a/arch/arm/mm/nommu.c
+++ b/arch/arm/mm/nommu.c
@@ -161,7 +161,7 @@  void __init paging_init(const struct machine_desc *mdesc)
 	mpu_setup();
 
 	/* allocate the zero page. */
-	zero_page = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
+	zero_page = (void *)memblock_alloc(PAGE_SIZE, PAGE_SIZE);
 	if (!zero_page)
 		panic("%s: Failed to allocate %lu bytes align=0x%lx\n",
 		      __func__, PAGE_SIZE, PAGE_SIZE);