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/arch/ppc32/include/exception.h

    r37f7cfe ra9b6bec  
    9898}
    9999
    100 NO_TRACE static inline unative_t istate_get_pc(istate_t *istate)
     100NO_TRACE static inline sysarg_t istate_get_pc(istate_t *istate)
    101101{
    102102        return istate->pc;
    103103}
    104104
    105 NO_TRACE static inline unative_t istate_get_fp(istate_t *istate)
     105NO_TRACE static inline sysarg_t istate_get_fp(istate_t *istate)
    106106{
    107107        return istate->sp;
Note: See TracChangeset for help on using the changeset viewer.