[PATCH] include/common: Make use of ALIGN and ALIGN_DOWN

[PATCH] include/common: Make use of ALIGN and ALIGN_DOWN

[Andrey Smirnov]

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 include/common.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/common.h b/include/common.h
index f93bd7f5d..abbe73fd3 100644
--- a/include/common.h
+++ b/include/common.h
@@ -109,8 +109,8 @@ void shutdown_barebox(void);
 
 #define PAGE_SIZE	4096
 #define PAGE_SHIFT	12
-#define PAGE_ALIGN(s) (((s) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1))
-#define PAGE_ALIGN_DOWN(x) ((x) & ~(PAGE_SIZE - 1))
+#define PAGE_ALIGN(s)	ALIGN(s, PAGE_SIZE)
+#define PAGE_ALIGN_DOWN(x) ALIGN_DOWN(x, PAGE_SIZE)
 
 int memory_display(const void *addr, loff_t offs, unsigned nbytes, int size, int swab);
 
-- 
2.17.1


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

Re: [PATCH] include/common: Make use of ALIGN and ALIGN_DOWN

[Sascha Hauer]

On Mon, Aug 20, 2018 at 11:27:36PM -0700, Andrey Smirnov wrote:
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
>  include/common.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/include/common.h b/include/common.h
> index f93bd7f5d..abbe73fd3 100644
> --- a/include/common.h
> +++ b/include/common.h
> @@ -109,8 +109,8 @@ void shutdown_barebox(void);
>  
>  #define PAGE_SIZE	4096
>  #define PAGE_SHIFT	12
> -#define PAGE_ALIGN(s) (((s) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1))
> -#define PAGE_ALIGN_DOWN(x) ((x) & ~(PAGE_SIZE - 1))
> +#define PAGE_ALIGN(s)	ALIGN(s, PAGE_SIZE)
> +#define PAGE_ALIGN_DOWN(x) ALIGN_DOWN(x, PAGE_SIZE)
>  
>  int memory_display(const void *addr, loff_t offs, unsigned nbytes, int size, int swab);
>  
> -- 
> 2.17.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
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