summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMischa Jonker <mischa.jonker@synopsys.com>2013-07-26 16:18:41 +0200
committerPantelis Antoniou <panto@antoniou-consulting.com>2013-09-20 18:59:12 +0300
commite8232fea41be712bfe894abbff08c39015d8d5d2 (patch)
treea266a3fa0dfde3fc139740d5c2324ada059cc49a
parent21bd5761a6e945eabaf245668868b58c2772fa21 (diff)
downloadu-boot-imx-e8232fea41be712bfe894abbff08c39015d8d5d2.zip
u-boot-imx-e8232fea41be712bfe894abbff08c39015d8d5d2.tar.gz
u-boot-imx-e8232fea41be712bfe894abbff08c39015d8d5d2.tar.bz2
Add parentheses to ALLOC_ALIGN_BUFFER macro's
Without those it's very easy to make mistakes when for instance the 'size' field is more than just a constant. Signed-off-by: Mischa Jonker <mjonker@synopsys.com> Cc: Alexey Brodkin <abrodkin@synopsys.com> Cc: Marek Vasut <marex@denx.de> Cc: Anton Staaf <robotboy@chromium.org> Cc: Tom Rini <trini@ti.com> Cc: Wolfgang Denk <wd@denx.de>
-rw-r--r--include/common.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h
index 8addf43..cc7454a 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1015,10 +1015,10 @@ static inline phys_addr_t map_to_sysmem(void *ptr)
* of a function scoped static buffer. It can not be used to create a cache
* line aligned global buffer.
*/
-#define PAD_COUNT(s, pad) ((s - 1) / pad + 1)
+#define PAD_COUNT(s, pad) (((s) - 1) / (pad) + 1)
#define PAD_SIZE(s, pad) (PAD_COUNT(s, pad) * pad)
#define ALLOC_ALIGN_BUFFER_PAD(type, name, size, align, pad) \
- char __##name[ROUND(PAD_SIZE(size * sizeof(type), pad), align) \
+ char __##name[ROUND(PAD_SIZE((size) * sizeof(type), pad), align) \
+ (align - 1)]; \
\
type *name = (type *) ALIGN((uintptr_t)__##name, align)