Changeset 0dc2fec in mainline for kernel/arch/ia32/include/arch/barrier.h

Timestamp:

2016-05-22T19:19:43Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (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:

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

kernel/arch/ia32/include/arch/barrier.h

@@ -98 +98 @@
 #endif
 
+#ifdef KERNEL
+
 /*
  * On ia32, the hardware takes care about instruction and data cache coherence,
@@ -107 +109 @@
 #define smc_coherence_block(a, l)  write_barrier()
 
+#endif  /* KERNEL */
+
 #endif