Ignore:
Timestamp:
2010-07-07T18:37:44Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
77385fe
Parents:
e2ea4ab1 (diff), 22c3444 (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 from mainline.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/abs32le/include/interrupt.h

    re2ea4ab1 r09b859c  
    3838#include <typedefs.h>
    3939#include <verify.h>
     40#include <trace.h>
    4041
    4142#define IVT_ITEMS  0
    … …  
    5455} istate_t;
    5556
    56 static inline int istate_from_uspace(istate_t *istate)
     57NO_TRACE static inline int istate_from_uspace(istate_t *istate)
    5758    REQUIRES_EXTENT_MUTABLE(istate)
    5859{
    … …  
    6364}
    6465
    65 static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
     66NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
     67    uintptr_t retaddr)
    6668    WRITES(&istate->ip)
    6769{
    … …  
    7173}
    7274
    73 static inline unative_t istate_get_pc(istate_t *istate)
     75NO_TRACE static inline unative_t istate_get_pc(istate_t *istate)
    7476    REQUIRES_EXTENT_MUTABLE(istate)
    7577{
    … …  
    7981}
    8082
    81 static inline unative_t istate_get_fp(istate_t *istate)
     83NO_TRACE static inline unative_t istate_get_fp(istate_t *istate)
    8284    REQUIRES_EXTENT_MUTABLE(istate)
    8385{
Note: See TracChangeset for help on using the changeset viewer.