Changeset 810a36f in mainline for kernel/arch/sparc64/include/arch/barrier.h

Timestamp:

2017-10-24T05:29:08Z (7 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b1eb7ef

Parents:

c8fbbe7 (diff), 673ea28 (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 branch 'types'.

File:

• kernel/arch/sparc64/include/arch/barrier.h (modified) (2 diffs)

kernel/arch/sparc64/include/arch/barrier.h

@@ -37 +37 @@
 
 #include <trace.h>
-
-#ifdef KERNEL
-#include <arch/common.h>
-#else
-#include <libarch/common.h>
-#endif
 
 /*
@@ -88 +82 @@
 NO_TRACE static inline void flush_pipeline(void)
 {
-        uint64_t pc;
+        unsigned long pc;
         
         /*