From e4789b0d5b354ac27f3879276ce92a7e169328ad Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 28 Dec 2019 10:45:09 -0700 Subject: [PATCH] common: Move ROUND() into kernel.h Move this macro in with all the other rounding macros. Signed-off-by: Simon Glass --- include/common.h | 2 -- include/linux/kernel.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/common.h b/include/common.h index 4110f75a93..997828311e 100644 --- a/include/common.h +++ b/include/common.h @@ -71,8 +71,6 @@ /* Put only stuff here that the assembler can digest */ -#define ROUND(a,b) (((a) + (b) - 1) & ~((b) - 1)) - /* Pull in stuff for the build system */ #ifdef DO_DEPS_ONLY # include diff --git a/include/linux/kernel.h b/include/linux/kernel.h index fefbc07375..b88c210065 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -69,6 +69,8 @@ #define DIV_ROUND_UP_ULL(ll, d) DIV_ROUND_DOWN_ULL((ll) + (d) - 1, (d)) +#define ROUND(a, b) (((a) + (b) - 1) & ~((b) - 1)) + #if BITS_PER_LONG == 32 # define DIV_ROUND_UP_SECTOR_T(ll,d) DIV_ROUND_UP_ULL(ll, d) #else -- 2.39.5