summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2019-12-28 20:45:09 +0300
committerTom Rini <trini@konsulko.com>2020-01-18 01:53:52 +0300
commit6df75135b56afbc060e5979477e71e0b95e0dad5 (patch)
treedebf44f67eff3aa95a0b01c8557f2c5923918ce4 /include
parent825faebbdfc9bcd3e6e6ac3d8f7b321deb43a94e (diff)
downloadu-boot-6df75135b56afbc060e5979477e71e0b95e0dad5.tar.xz
common: Move ROUND() into kernel.h
Move this macro in with all the other rounding macros. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
-rw-r--r--include/common.h2
-rw-r--r--include/linux/kernel.h2
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 <env_internal.h>
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