diff --git a/kernel-src/include/util.h b/kernel-src/include/util.h
index a7999515..8acc3223 100644
--- a/kernel-src/include/util.h
+++ b/kernel-src/include/util.h
@@ -1,7 +1,7 @@
 #ifndef _UTIL_H
 #define _UTIL_H
 
-#define ROUND_UP(v, n) (n - (v % n) + v)
-#define ROUND_DOWN(v, n) (v - (v % n))
+#define ROUND_DOWN(v, n) ((v) - ((v) % (n)))
+#define ROUND_UP(v, n) ROUND_DOWN((v) + (n) - 1, n)
 
 #endif