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

Changeset a9b6bec in mainline for kernel/generic/src/synch/futex.c


Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
11658b64
Parents:
37f7cfe (diff), 228e490 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/synch/futex.c

    r37f7cfe ra9b6bec  
    6060
    6161static futex_t *futex_find(uintptr_t paddr);
    62 static size_t futex_ht_hash(unative_t *key);
    63 static bool futex_ht_compare(unative_t *key, size_t keys, link_t *item);
     62static size_t futex_ht_hash(sysarg_t *key);
     63static bool futex_ht_compare(sysarg_t *key, size_t keys, link_t *item);
    6464static void futex_ht_remove_callback(link_t *item);
    6565
     
    108108 *                      synch.h.
    109109 */
    110 unative_t sys_futex_sleep(uintptr_t uaddr)
     110sysarg_t sys_futex_sleep(uintptr_t uaddr)
    111111{
    112112        futex_t *futex;
     
    122122        if (!t || !PTE_VALID(t) || !PTE_PRESENT(t)) {
    123123                page_table_unlock(AS, true);
    124                 return (unative_t) ENOENT;
     124                return (sysarg_t) ENOENT;
    125125        }
    126126        paddr = PTE_GET_FRAME(t) + (uaddr - ALIGN_DOWN(uaddr, PAGE_SIZE));
     
    136136        udebug_stoppable_end();
    137137#endif
    138         return (unative_t) rc;
     138        return (sysarg_t) rc;
    139139}
    140140
     
    145145 * @return              ENOENT if there is no physical mapping for uaddr.
    146146 */
    147 unative_t sys_futex_wakeup(uintptr_t uaddr)
     147sysarg_t sys_futex_wakeup(uintptr_t uaddr)
    148148{
    149149        futex_t *futex;
     
    158158        if (!t || !PTE_VALID(t) || !PTE_PRESENT(t)) {
    159159                page_table_unlock(AS, true);
    160                 return (unative_t) ENOENT;
     160                return (sysarg_t) ENOENT;
    161161        }
    162162        paddr = PTE_GET_FRAME(t) + (uaddr - ALIGN_DOWN(uaddr, PAGE_SIZE));
     
    235235 * @return              Index into futex hash table.
    236236 */
    237 size_t futex_ht_hash(unative_t *key)
     237size_t futex_ht_hash(sysarg_t *key)
    238238{
    239239        return (*key & (FUTEX_HT_SIZE - 1));
     
    247247 * @return              True if the item matches the key. False otherwise.
    248248 */
    249 bool futex_ht_compare(unative_t *key, size_t keys, link_t *item)
     249bool futex_ht_compare(sysarg_t *key, size_t keys, link_t *item)
    250250{
    251251        futex_t *futex;
Note: See TracChangeset for help on using the changeset viewer.