Index: kernel/generic/include/macros.h
===================================================================
--- kernel/generic/include/macros.h	(revision 1ed901d972d7bb4dbb50602941a349a4c7649a9b)
+++ kernel/generic/include/macros.h	(revision 770971c11224abfca847a41fbd1c496a38d71ff8)
@@ -87,5 +87,6 @@
 #define UPPER32(arg)  (((arg) >> 32) & 0xffffffff)
 
-#define MERGE_LOHI32(lo, hi)  ((lo & 0xffffffff) | ((hi & 0xffffffff) << 32))
+#define MERGE_LOHI32(lo, hi) \
+    (((lo) & 0xffffffff) | (((hi) & 0xffffffff) << 32))
 
 /** Pseudorandom generator