Changeset 3e01316f in mainline for kernel/arch/arm32/include/istate.h


Ignore:
Timestamp:
2011-08-17T18:04:50Z (13 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0cf27ee
Parents:
e898296d (diff), e6165be (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 libposix.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/arm32/include/istate.h

    re898296d r3e01316f  
    3535#define KERN_arm32_ISTATE_H_
    3636
     37#include <trace.h>
     38
     39#ifdef KERNEL
     40
    3741#include <arch/regutils.h>
    3842
    39 #ifdef KERNEL
    40 #include <typedefs.h>
    41 #include <trace.h>
    42 #else
    43 #include <sys/types.h>
    44 #define NO_TRACE
    45 #endif
     43#else /* KERNEL */
     44
     45#include <libarch/regutils.h>
     46
     47#endif /* KERNEL */
    4648
    4749/** Struct representing CPU state saved when an exception occurs. */
Note: See TracChangeset for help on using the changeset viewer.