Index: kernel/arch/amd64/include/atomic.h
===================================================================
--- kernel/arch/amd64/include/atomic.h	(revision 0949b7ac2d86311384e368ae8974d7298c01d9e8)
+++ kernel/arch/amd64/include/atomic.h	(revision d99fac96cbfec51361fae6794a980aa1ef9bc770)
@@ -141,5 +141,5 @@
 
 
-#define _atomic_cas_ptr_impl(pptr, exp_val, new_val, old_val, prefix)
+#define _atomic_cas_ptr_impl(pptr, exp_val, new_val, old_val, prefix) \
 	asm volatile ( \
 		prefix " cmpxchgq %[newval], %[ptr]\n" \
Index: kernel/test/cht/cht1.c
===================================================================
--- kernel/test/cht/cht1.c	(revision 0949b7ac2d86311384e368ae8974d7298c01d9e8)
+++ kernel/test/cht/cht1.c	(revision d99fac96cbfec51361fae6794a980aa1ef9bc770)
@@ -35,6 +35,6 @@
 	/* Place at the top to simplify re-casting. */
 	cht_link_t link;
-	int hash;
-	int unique_id;
+	size_t hash;
+	size_t unique_id;
 	bool deleted;
 	bool mark;
@@ -50,5 +50,5 @@
 static size_t val_key_hash(void *key)
 {
-	return (int)key % 10;
+	return (uintptr_t)key % 10;
 }
 
@@ -63,5 +63,5 @@
 {
 	val_t *v2 = member_to_inst(item2, val_t, link);
-	return (int)key == v2->unique_id;
+	return (uintptr_t)key == v2->unique_id;
 }
 
@@ -83,5 +83,5 @@
 };
 
-static void set_val(val_t *v, size_t h, int uid)
+static void set_val(val_t *v, size_t h, size_t uid)
 {
 	v->hash = h;