Ignore:
Timestamp:
2011-04-15T19:38:07Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9dd730d1
Parents:
6b9e85b (diff), b2fb47f (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

    r6b9e85b r8b655705  
    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_IPC_CALL_SYNC_FAST,
     
    7072        SYS_IPC_POKE,
    7173        SYS_IPC_HANGUP,
    72         SYS_IPC_REGISTER_IRQ,
    73         SYS_IPC_UNREGISTER_IRQ,
    7474        SYS_IPC_CONNECT_KBOX,
    7575       
     
    8282        SYS_PHYSMEM_MAP,
    8383        SYS_IOSPACE_ENABLE,
     84        SYS_REGISTER_IRQ,
     85        SYS_UNREGISTER_IRQ,
    8486       
    8587        SYS_SYSINFO_GET_TAG,
Note: See TracChangeset for help on using the changeset viewer.