kernel: roundup should only reference arguments once
authorEric Paris <eparis@redhat.com>
Wed, 13 Oct 2010 21:50:08 +0000 (17:50 -0400)
committerJames Morris <jmorris@namei.org>
Wed, 20 Oct 2010 23:12:54 +0000 (10:12 +1100)
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>
include/linux/kernel.h

index 6d6eea7f7b1eaabc23d871b7b233043f88460804..1759ba5adce845fa08d4b1fd899920ac65436938 100644 (file)
@@ -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);                            \