From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from conuserg-09.nifty.com ([210.131.2.76]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eRsVr-0000YW-1C for barebox@lists.infradead.org; Thu, 21 Dec 2017 04:31:21 +0000 From: Masahiro Yamada Date: Thu, 21 Dec 2017 13:30:35 +0900 Message-Id: <1513830635-24496-1-git-send-email-yamada.masahiro@socionext.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH] linux/kernel.h: move ALIGN_DOWN() to include/linux/kernel.h To: barebox@lists.infradead.org Linux commit ed067d4a859f ("linux/kernel.h: Add ALIGN_DOWN macro") moved ALIGN_MACRO to include/linux/kernel.h. Let's do likewise. Signed-off-by: Masahiro Yamada --- include/common.h | 2 -- include/linux/kernel.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/common.h b/include/common.h index dd7445e..54c76d4 100644 --- a/include/common.h +++ b/include/common.h @@ -93,8 +93,6 @@ extern int (*barebox_main)(void); void __noreturn start_barebox(void); void shutdown_barebox(void); -#define ALIGN_DOWN(x, a) ((x) & ~((typeof(x))(a) - 1)) - #define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) /* diff --git a/include/linux/kernel.h b/include/linux/kernel.h index b4d2f09..ab713f2 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -33,6 +33,7 @@ #define S64_MIN ((s64)(-S64_MAX - 1)) #define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a) - 1) +#define ALIGN_DOWN(x, a) ALIGN((x) - ((a) - 1), (a)) #define __ALIGN_MASK(x, mask) (((x) + (mask)) & ~(mask)) #define PTR_ALIGN(p, a) ((typeof(p))ALIGN((unsigned long)(p), (a))) #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) -- 2.7.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox