Changeset 925a21e in mainline for kernel/arch/sparc64/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/sparc64/include/istate.h

    r867e2555 r925a21e  
    3737#define KERN_sparc64_ISTATE_H_
    3838
     39#include <trace.h>
     40
     41#ifdef KERNEL
     42
    3943#include <arch/regdef.h>
    4044
    41 #ifdef KERNEL
    42 #include <typedefs.h>
    43 #include <trace.h>
    44 #else
    45 #include <sys/types.h>
    46 #define NO_TRACE
    47 #endif
     45#else /* KERNEL */
     46
     47#include <libarch/regdef.h>
     48
     49#endif /* KERNEL */
    4850
    4951typedef struct istate {
Note: See TracChangeset for help on using the changeset viewer.