[PATCH master] ARM: mmu64: fix build for non-MMU configurations

[PATCH master] ARM: mmu64: fix build for non-MMU configurations

[Ahmad Fatoum]

barebox only catches null pointer dereferences when MMU support is
enabled. Thus the empty stubs should always be used on !CONFIG_MMU
systems, disregarding whether CONFIG_ARCH_HAS_ZERO_PAGE is selected
or not.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 include/zero_page.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/zero_page.h b/include/zero_page.h
index ad6861f240c6..519e65be7628 100644
--- a/include/zero_page.h
+++ b/include/zero_page.h
@@ -4,7 +4,7 @@
 
 #include <common.h>
 
-#if defined CONFIG_ARCH_HAS_ZERO_PAGE
+#if defined CONFIG_ARCH_HAS_ZERO_PAGE && defined CONFIG_MMU
 
 /*
  * zero_page_faulting - fault when accessing the zero page
-- 
2.29.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH master] ARM: mmu64: fix build for non-MMU configurations

[Sascha Hauer]

On Thu, Mar 11, 2021 at 11:36:54AM +0100, Ahmad Fatoum wrote:
> barebox only catches null pointer dereferences when MMU support is
> enabled. Thus the empty stubs should always be used on !CONFIG_MMU
> systems, disregarding whether CONFIG_ARCH_HAS_ZERO_PAGE is selected
> or not.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  include/zero_page.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/include/zero_page.h b/include/zero_page.h
> index ad6861f240c6..519e65be7628 100644
> --- a/include/zero_page.h
> +++ b/include/zero_page.h
> @@ -4,7 +4,7 @@
>  
>  #include <common.h>
>  
> -#if defined CONFIG_ARCH_HAS_ZERO_PAGE
> +#if defined CONFIG_ARCH_HAS_ZERO_PAGE && defined CONFIG_MMU
>  
>  /*
>   * zero_page_faulting - fault when accessing the zero page
> -- 
> 2.29.2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox