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