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++;