Index: kernel/generic/include/macros.h
===================================================================
--- kernel/generic/include/macros.h	(revision e2650d358e06533dcf2c3cf90e673dffacd29dd3)
+++ kernel/generic/include/macros.h	(revision c621f4aa64c16cb4d9c2b20dbf5be59c66c25ed3)
@@ -49,9 +49,9 @@
  *
  */
-NO_TRACE static inline int overlaps(uintptr_t s1, size_t sz1, uintptr_t s2,
-    size_t sz2)
+NO_TRACE static inline int overlaps(uint64_t s1, uint64_t sz1, uint64_t s2,
+    uint64_t sz2)
 {
-	uintptr_t e1 = s1 + sz1;
-	uintptr_t e2 = s2 + sz2;
+	uint64_t e1 = s1 + sz1;
+	uint64_t e2 = s2 + sz2;
 	
 	return ((s1 < e2) && (s2 < e1));
@@ -66,9 +66,9 @@
  *
  */
-NO_TRACE static inline int iswithin(uintptr_t s1, size_t sz1, uintptr_t s2,
-    size_t sz2)
+NO_TRACE static inline int iswithin(uint64_t s1, uint64_t sz1, uint64_t s2,
+    uint64_t sz2)
 {
-	uintptr_t e1 = s1 + sz1;
-	uintptr_t e2 = s2 + sz2;
+	uint64_t e1 = s1 + sz1;
+	uint64_t e2 = s2 + sz2;
 	
 	return ((s1 <= s2) && (e1 >= e2));