From 591b8e9b2b7a1e4faba77cc1c4cf6110deee7d18 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 10 Nov 2010 18:46:40 +0000 Subject: [PATCH] --- yaml --- r: 224946 b: refs/heads/master c: 51c56f40ef41ca780ff001d59727eda03fa39374 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/tx.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a0a9d4687442..82dedaf2697b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab28c12a8e6fea875b6757052e211772f62fa771 +refs/heads/master: 51c56f40ef41ca780ff001d59727eda03fa39374 diff --git a/trunk/drivers/net/sfc/tx.c b/trunk/drivers/net/sfc/tx.c index 03194f7c0954..fef22351ddbd 100644 --- a/trunk/drivers/net/sfc/tx.c +++ b/trunk/drivers/net/sfc/tx.c @@ -240,8 +240,7 @@ netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb) * of read_count. */ smp_mb(); tx_queue->old_read_count = - *(volatile unsigned *) - &tx_queue->read_count; + ACCESS_ONCE(tx_queue->read_count); fill_level = (tx_queue->insert_count - tx_queue->old_read_count); q_space = efx->txq_entries - 1 - fill_level; @@ -764,7 +763,7 @@ static int efx_tx_queue_insert(struct efx_tx_queue *tx_queue, * stopped from the access of read_count. */ smp_mb(); tx_queue->old_read_count = - *(volatile unsigned *)&tx_queue->read_count; + ACCESS_ONCE(tx_queue->read_count); fill_level = (tx_queue->insert_count - tx_queue->old_read_count); q_space = efx->txq_entries - 1 - fill_level;