Changeset f2962621 in mainline for kernel/generic/src/synch/futex.c
- Timestamp:
- 2010-12-17T10:14:01Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 6e5dc07
- Parents:
- 9223dc5c (diff), 11658b64 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified kernel/generic/src/synch/futex.c ¶
r9223dc5c rf2962621 60 60 61 61 static 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);62 static size_t futex_ht_hash(sysarg_t *key); 63 static bool futex_ht_compare(sysarg_t *key, size_t keys, link_t *item); 64 64 static void futex_ht_remove_callback(link_t *item); 65 65 … … 108 108 * synch.h. 109 109 */ 110 unative_t sys_futex_sleep(uintptr_t uaddr)110 sysarg_t sys_futex_sleep(uintptr_t uaddr) 111 111 { 112 112 futex_t *futex; … … 122 122 if (!t || !PTE_VALID(t) || !PTE_PRESENT(t)) { 123 123 page_table_unlock(AS, true); 124 return ( unative_t) ENOENT;124 return (sysarg_t) ENOENT; 125 125 } 126 126 paddr = PTE_GET_FRAME(t) + (uaddr - ALIGN_DOWN(uaddr, PAGE_SIZE)); … … 136 136 udebug_stoppable_end(); 137 137 #endif 138 return ( unative_t) rc;138 return (sysarg_t) rc; 139 139 } 140 140 … … 145 145 * @return ENOENT if there is no physical mapping for uaddr. 146 146 */ 147 unative_t sys_futex_wakeup(uintptr_t uaddr)147 sysarg_t sys_futex_wakeup(uintptr_t uaddr) 148 148 { 149 149 futex_t *futex; … … 158 158 if (!t || !PTE_VALID(t) || !PTE_PRESENT(t)) { 159 159 page_table_unlock(AS, true); 160 return ( unative_t) ENOENT;160 return (sysarg_t) ENOENT; 161 161 } 162 162 paddr = PTE_GET_FRAME(t) + (uaddr - ALIGN_DOWN(uaddr, PAGE_SIZE)); … … 235 235 * @return Index into futex hash table. 236 236 */ 237 size_t futex_ht_hash( unative_t *key)237 size_t futex_ht_hash(sysarg_t *key) 238 238 { 239 239 return (*key & (FUTEX_HT_SIZE - 1)); … … 247 247 * @return True if the item matches the key. False otherwise. 248 248 */ 249 bool futex_ht_compare( unative_t *key, size_t keys, link_t *item)249 bool futex_ht_compare(sysarg_t *key, size_t keys, link_t *item) 250 250 { 251 251 futex_t *futex;
Note:
See TracChangeset
for help on using the changeset viewer.