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/src/interrupt/interrupt.c

    r37f7cfe ra9b6bec  
    197197                /* Notify the subscriber that a fault occurred. */
    198198                event_notify_3(EVENT_FAULT, LOWER32(TASK->taskid),
    199                     UPPER32(TASK->taskid), (unative_t) THREAD);
     199                    UPPER32(TASK->taskid), (sysarg_t) THREAD);
    200200               
    201201#ifdef CONFIG_UDEBUG
     
    263263               
    264264                const char *symbol =
    265                     symtab_fmt_name_lookup((unative_t) exc_table[i].handler);
     265                    symtab_fmt_name_lookup((sysarg_t) exc_table[i].handler);
    266266               
    267267#ifdef __32_BITS__
Note: See TracChangeset for help on using the changeset viewer.