Changeset 2b3dd78 in mainline for kernel/generic/include/interrupt.h


Ignore:
Timestamp:
2018-01-31T12:02:00Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5595841
Parents:
a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/interrupt.h

    ra0a9cc2 r2b3dd78  
    6161
    6262extern void fault_from_uspace(istate_t *, const char *, ...)
    63     PRINTF_ATTRIBUTE(2, 3);
     63    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
    6464extern void fault_if_from_uspace(istate_t *, const char *, ...)
    65     PRINTF_ATTRIBUTE(2, 3);
     65    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
    6666extern istate_t *istate_get(thread_t *);
    6767extern iroutine_t exc_register(unsigned int, const char *, bool, iroutine_t);
Note: See TracChangeset for help on using the changeset viewer.