Changeset d99fac9 in mainline

Timestamp:

2012-07-27T19:54:14Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8e3ed06

Parents:

0949b7a

Message:

Fixed build for amd64 (due to bad cht1 test and atomic.h).

Location:

kernel

Files:

• arch/amd64/include/atomic.h (modified) (1 diff)
• test/cht/cht1.c (modified) (4 diffs)

kernel/arch/amd64/include/atomic.h

@@ -141 +141 @@
 
 
-#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" \

kernel/test/cht/cht1.c

@@ -35 +35 @@
         /* 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 +50 @@
 static size_t val_key_hash(void *key)
 {
-        return (int)key % 10;
+        return (uintptr_t)key % 10;
 }
 
@@ -63 +63 @@
 {
         val_t *v2 = member_to_inst(item2, val_t, link);
-        return (int)key == v2->unique_id;
+        return (uintptr_t)key == v2->unique_id;
 }
 
@@ -83 +83 @@
 };
 
-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;