Index: kernel/generic/include/macros.h
===================================================================
--- kernel/generic/include/macros.h	(revision b1d3c36aca6850dfcd12418b4a6f60aa37a83487)
+++ kernel/generic/include/macros.h	(revision 9647c86c7160ffdc651d72e42bf14bcbf7a7f9d5)
@@ -84,6 +84,6 @@
 #define STRING_ARG(arg)  #arg
 
-#define LOWER32(arg)  ((arg) & 0xffffffff)
-#define UPPER32(arg)  (((arg) >> 32) & 0xffffffff)
+#define LOWER32(arg)  (((uint64_t) (arg)) & 0xffffffff)
+#define UPPER32(arg)  (((((uint64_t) arg)) >> 32) & 0xffffffff)
 
 #define MERGE_LOUP32(lo, up) \