Changeset db6e419 in mainline for kernel/arch/abs32le/include/istate.h


Ignore:
Timestamp:
2011-08-16T18:53:00Z (13 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
49160c4
Parents:
e0e922d (diff), 45058baa (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.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    re0e922d rdb6e419  
    3636#define KERN_abs32le_ISTATE_H_
    3737
     38#include <trace.h>
     39
    3840#ifdef KERNEL
    3941
    40 #include <typedefs.h>
    4142#include <verify.h>
    42 #include <trace.h>
    4343
    4444#else /* KERNEL */
    4545
    46 #include <sys/types.h>
    47 
    48 #define NO_TRACE
    4946#define REQUIRES_EXTENT_MUTABLE(arg)
    5047#define WRITES(arg)
Note: See TracChangeset for help on using the changeset viewer.