Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a9b6bec in mainline for kernel/generic/src/syscall/syscall.c


Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
11658b64
Parents:
37f7cfe (diff), 228e490 (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

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/syscall/syscall.c

    r37f7cfe ra9b6bec  
    5656
    5757/** Dispatch system call */
    58 unative_t syscall_handler(unative_t a1, unative_t a2, unative_t a3,
    59     unative_t a4, unative_t a5, unative_t a6, unative_t id)
     58sysarg_t syscall_handler(sysarg_t a1, sysarg_t a2, sysarg_t a3,
     59    sysarg_t a4, sysarg_t a5, sysarg_t a6, sysarg_t id)
    6060{
    6161        /* Do userpace accounting */
     
    7474#endif
    7575       
    76         unative_t rc;
     76        sysarg_t rc;
    7777        if (id < SYSCALL_END) {
    7878                rc = syscall_table[id](a1, a2, a3, a4, a5, a6);
     
    147147        (syshandler_t) sys_ipc_register_irq,
    148148        (syshandler_t) sys_ipc_unregister_irq,
     149        (syshandler_t) sys_ipc_connect_kbox,
    149150       
    150151        /* Event notification syscalls. */
     
    169170        /* Debug calls */
    170171        (syshandler_t) sys_debug_enable_console,
    171         (syshandler_t) sys_debug_disable_console,
    172        
    173         (syshandler_t) sys_ipc_connect_kbox
     172        (syshandler_t) sys_debug_disable_console
    174173};
    175174
Note: See TracChangeset for help on using the changeset viewer.