diff --git a/[refs] b/[refs]
index c89f22282d1c..067277e62dbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 686a0f3d71203bbfcc186900bbb8ac2cfc3d803c
+refs/heads/master: b28efd54d9d5c8005a29cd8782335beb9daaa32d
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index 6d6eea7f7b1e..1759ba5adce8 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/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);				\