Ignore:
Timestamp:
2011-02-04T20:56:52Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0397e5a4, e29e09cf
Parents:
e778543 (diff), 0b37882 (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/syscall/syscall.h

    re778543 r17aca1c  
    4848        SYS_TASK_SET_NAME,
    4949        SYS_TASK_KILL,
     50        SYS_TASK_EXIT,
    5051        SYS_PROGRAM_SPAWN_LOADER,
    5152       
     
    5859        SYS_AS_AREA_CHANGE_FLAGS,
    5960        SYS_AS_AREA_DESTROY,
     61        SYS_AS_GET_UNMAPPED_AREA,
    6062       
    6163        SYS_PAGE_FIND_MAPPING,
     
    7274        SYS_IPC_POKE,
    7375        SYS_IPC_HANGUP,
    74         SYS_IPC_REGISTER_IRQ,
    75         SYS_IPC_UNREGISTER_IRQ,
    7676        SYS_IPC_CONNECT_KBOX,
    7777       
     
    8484        SYS_PHYSMEM_MAP,
    8585        SYS_IOSPACE_ENABLE,
     86        SYS_REGISTER_IRQ,
     87        SYS_UNREGISTER_IRQ,
    8688       
    8789        SYS_SYSINFO_GET_TAG,
Note: See TracChangeset for help on using the changeset viewer.