summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-10-13 17:50:08 -0400
committerJames Morris <jmorris@namei.org>2010-10-21 10:12:54 +1100
commitb28efd54d9d5c8005a29cd8782335beb9daaa32d (patch)
tree4b8be3bc7392caa68fa79456e4ec8b8a8fb6eeec /include
parent686a0f3d71203bbfcc186900bbb8ac2cfc3d803c (diff)
downloadlwn-b28efd54d9d5c8005a29cd8782335beb9daaa32d.tar.gz
lwn-b28efd54d9d5c8005a29cd8782335beb9daaa32d.zip
kernel: roundup should only reference arguments once
Currently the roundup macro references it's arguments more than one time. This patch changes it so it will only use its arguments once. Suggested-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/kernel.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 6d6eea7f7b1e..1759ba5adce8 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -58,7 +58,12 @@ extern const char linux_proc_banner[];
#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
-#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
+#define roundup(x, y) ( \
+{ \
+ typeof(y) __y = y; \
+ (((x) + (__y - 1)) / __y) * __y; \
+} \
+)
#define rounddown(x, y) ( \
{ \
typeof(x) __x = (x); \