Changeset 925a21e in mainline for kernel/arch/mips64/include/istate.h


Ignore:
Timestamp:
2011-09-24T14:20:29Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5bf76c1
Parents:
867e2555 (diff), 1ab4aca (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/mips64/include/istate.h

    r867e2555 r925a21e  
    3636#define KERN_mips64_ISTATE_H_
    3737
    38 #include <arch/cp0.h>
     38#include <trace.h>
    3939
    4040#ifdef KERNEL
    4141
    42 #include <typedefs.h>
    43 #include <trace.h>
     42#include <arch/cp0.h>
    4443
    45 #else
     44#else /* KERNEL */
    4645
    47 #include <sys/types.h>
    48 #define NO_TRACE
     46#include <libarch/cp0.h>
    4947
    50 #endif
     48#endif /* KERNEL */
    5149
    5250typedef struct istate {
Note: See TracChangeset for help on using the changeset viewer.