Ignore:
Timestamp:
2011-01-31T20:32:33Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
37cf3792
Parents:
4fe94c66 (diff), 197ef43 (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

    r4fe94c66 r12573db  
    4848        SYS_TASK_SET_NAME,
    4949        SYS_TASK_KILL,
     50        SYS_TASK_EXIT,
    5051        SYS_PROGRAM_SPAWN_LOADER,
    5152       
    … …  
    7071        SYS_IPC_POKE,
    7172        SYS_IPC_HANGUP,
    72         SYS_IPC_REGISTER_IRQ,
    73         SYS_IPC_UNREGISTER_IRQ,
    7473        SYS_IPC_CONNECT_KBOX,
    7574       
    … …  
    8281        SYS_PHYSMEM_MAP,
    8382        SYS_IOSPACE_ENABLE,
     83        SYS_REGISTER_IRQ,
     84        SYS_UNREGISTER_IRQ,
    8485       
    8586        SYS_SYSINFO_GET_TAG,
Note: See TracChangeset for help on using the changeset viewer.