Changeset 7bdcc45 in mainline for kernel/generic/include/synch/futex.h


Ignore:
Timestamp:
2010-12-16T16:38:49Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7837101
Parents:
8e58f94 (diff), eb221e5 (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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/synch/futex.h

    r8e58f94 r7bdcc45  
    5252
    5353extern void futex_init(void);
    54 extern unative_t sys_futex_sleep(uintptr_t);
    55 extern unative_t sys_futex_wakeup(uintptr_t);
     54extern sysarg_t sys_futex_sleep(uintptr_t);
     55extern sysarg_t sys_futex_wakeup(uintptr_t);
    5656
    5757extern void futex_cleanup(void);
Note: See TracChangeset for help on using the changeset viewer.