Ignore:
Timestamp:
2011-06-08T19:39:52Z (14 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2af29ed
Parents:
e686889c (diff), 0eff68e (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/include/syscall/syscall.h

    re686889c r1564c4b  
    4444        SYS_THREAD_GET_ID,
    4545        SYS_THREAD_USLEEP,
     46        SYS_THREAD_UDELAY,
    4647       
    4748        SYS_TASK_GET_ID,
     
    6162        SYS_AS_GET_UNMAPPED_AREA,
    6263       
     64        SYS_PAGE_FIND_MAPPING,
     65       
    6366        SYS_IPC_CALL_SYNC_FAST,
    6467        SYS_IPC_CALL_SYNC_SLOW,
     
    7578       
    7679        SYS_EVENT_SUBSCRIBE,
     80        SYS_EVENT_UNMASK,
    7781       
    7882        SYS_CAP_GRANT,
Note: See TracChangeset for help on using the changeset viewer.