From d8ee67a6c2ea1be93f24baefa2544ce4ddac4d07 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Mon, 6 Sep 2010 18:21:41 -0700
Subject: [PATCH] --- yaml --- r: 214307 b: refs/heads/master c:
 f89e49e79f839dbe79364ec6cd7e2274ad11b120 h: refs/heads/master i:   214305:
 4c3f4a9fdbb5228172807e7d424f856948faef97   214303:
 77b472a0d1d7a039ea2c522bfa8be65d10490fba v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/ibmveth.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8cf09b1a0bc8..e1bbbab09e1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d86c61ae41d9068fd5e5cc01a4abd53c4fe3ab5
+refs/heads/master: f89e49e79f839dbe79364ec6cd7e2274ad11b120
diff --git a/trunk/drivers/net/ibmveth.c b/trunk/drivers/net/ibmveth.c
index c236c8af3367..aedcb1802182 100644
--- a/trunk/drivers/net/ibmveth.c
+++ b/trunk/drivers/net/ibmveth.c
@@ -1010,7 +1010,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
 		if (!ibmveth_rxq_pending_buffer(adapter))
 			break;
 
-		rmb();
+		smp_rmb();
 		if (!ibmveth_rxq_buffer_valid(adapter)) {
 			wmb(); /* suggested by larson1 */
 			adapter->rx_invalid_buffer++;