[PATCH 1/2] ARM: add implementation for dma_alloc_writecombine for !CONFIG_MMU

[PATCH 1/2] ARM: add implementation for dma_alloc_writecombine for !CONFIG_MMU

[Lucas Stach]

This fixes build failures in builds without MMU support by providing
a fallback implementation.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/include/asm/dma.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h
index d9bce3d70e61..1ba2edf01275 100644
--- a/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h
@@ -23,6 +23,11 @@ static inline void *dma_alloc_coherent(size_t size, dma_addr_t *dma_handle)
 	return ret;
 }
 
+static inline void *dma_alloc_writecombine(size_t size, dma_addr_t *dma_handle)
+{
+	return dma_alloc_coherent(size, dma_handle);
+}
+
 static inline void dma_free_coherent(void *mem, dma_addr_t dma_handle,
 				     size_t size)
 {
-- 
2.5.0


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

[PATCH 2/2] passwd: avoid NULL ptr usage

[Lucas Stach]

Fixes
common/password.c: In function 'check_passwd':
common/password.c:292:4: warning: reading through null pointer (argument 3)
    pr_err("No such digest: %s\n", PASSWD_SUM);

if no algo is enabled in which case PASSWD_SUM is defined to NULL.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 common/password.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/password.c b/common/password.c
index 43c5e0cc0e08..b5b7655a6435 100644
--- a/common/password.c
+++ b/common/password.c
@@ -289,7 +289,8 @@ static int check_passwd(unsigned char *passwd, size_t length)
 	} else {
 		d = digest_alloc(PASSWD_SUM);
 		if (!d) {
-			pr_err("No such digest: %s\n", PASSWD_SUM);
+			pr_err("No such digest: %s\n",
+			       PASSWD_SUM ? PASSWD_SUM : "NULL");
 			return -ENOENT;
 		}
 
-- 
2.5.0


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

Re: [PATCH 1/2] ARM: add implementation for dma_alloc_writecombine for !CONFIG_MMU

[Sascha Hauer]

On Wed, Sep 09, 2015 at 10:38:05AM +0200, Lucas Stach wrote:
> This fixes build failures in builds without MMU support by providing
> a fallback implementation.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  arch/arm/include/asm/dma.h | 5 +++++
>  1 file changed, 5 insertions(+)

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 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