Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset d99fac9 in mainline


Ignore:
Timestamp:
2012-07-27T19:54:14Z (9 years ago)
Author:
Adam Hraska <adam.hraska+hos@…>
Branches:
lfn, master
Children:
8e3ed06
Parents:
0949b7a
Message:

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

Location:
kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/amd64/include/atomic.h

    r0949b7a rd99fac9  
    141141
    142142
    143 #define _atomic_cas_ptr_impl(pptr, exp_val, new_val, old_val, prefix)
     143#define _atomic_cas_ptr_impl(pptr, exp_val, new_val, old_val, prefix) \
    144144        asm volatile ( \
    145145                prefix " cmpxchgq %[newval], %[ptr]\n" \
  • kernel/test/cht/cht1.c

    r0949b7a rd99fac9  
    3535        /* Place at the top to simplify re-casting. */
    3636        cht_link_t link;
    37         int hash;
    38         int unique_id;
     37        size_t hash;
     38        size_t unique_id;
    3939        bool deleted;
    4040        bool mark;
     
    5050static size_t val_key_hash(void *key)
    5151{
    52         return (int)key % 10;
     52        return (uintptr_t)key % 10;
    5353}
    5454
     
    6363{
    6464        val_t *v2 = member_to_inst(item2, val_t, link);
    65         return (int)key == v2->unique_id;
     65        return (uintptr_t)key == v2->unique_id;
    6666}
    6767
     
    8383};
    8484
    85 static void set_val(val_t *v, size_t h, int uid)
     85static void set_val(val_t *v, size_t h, size_t uid)
    8686{
    8787        v->hash = h;
Note: See TracChangeset for help on using the changeset viewer.