aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-06-20 09:21:04 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-06-20 09:21:04 -0400
commitc03f2971b07a79c5402f0d7126cc2cd856028e38 (patch)
tree95248ebb9794a06a63539e2bd97363445dff02b7
parent182eaefab712f4360126e044c758e75d763d05c4 (diff)
parent3373c0cf71f2812eeb9694839456df6f67fd32ac (diff)
downloadlinux-yocto-c03f2971b07a79c5402f0d7126cc2cd856028e38.tar.gz
linux-yocto-c03f2971b07a79c5402f0d7126cc2cd856028e38.tar.bz2
linux-yocto-c03f2971b07a79c5402f0d7126cc2cd856028e38.zip
Merge branch 'v4.15/standard/base' into v4.15/standard/mti-malta32
-rw-r--r--drivers/staging/octeon/ethernet-tx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index 31f35025d19e..af9da2508e93 100644
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/drivers/staging/octeon/ethernet-tx.c
@@ -264,6 +264,9 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
pko_command.s.n2 = 1; /* Don't pollute L2 with the outgoing packet */
pko_command.s.segs = 1;
pko_command.s.total_bytes = skb->len;
+#if GCC_VERSION >= 80000
+ barrier();
+#endif
pko_command.s.size0 = CVMX_FAU_OP_SIZE_32;
pko_command.s.subone0 = 1;