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

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/include/udebug/udebug.h

    r37f7cfe ra9b6bec  
    212212        waitq_t go_wq;
    213213        call_t *go_call;
    214         unative_t syscall_args[6];
     214        sysarg_t syscall_args[6];
    215215        istate_t *uspace_state;
    216216
     
    229229void udebug_thread_initialize(udebug_thread_t *ut);
    230230
    231 void udebug_syscall_event(unative_t a1, unative_t a2, unative_t a3,
    232     unative_t a4, unative_t a5, unative_t a6, unative_t id, unative_t rc,
     231void udebug_syscall_event(sysarg_t a1, sysarg_t a2, sysarg_t a3,
     232    sysarg_t a4, sysarg_t a5, sysarg_t a6, sysarg_t id, sysarg_t rc,
    233233    bool end_variant);
    234234
Note: See TracChangeset for help on using the changeset viewer.