Merge patch series "scsi: libsas: Some coding style fixes and cleanups"

[linux-2.6-block.git] / drivers / net / macvlan.c

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index b8cc55b2d721cd91b8187744f6bd8fe88a22f8cd..99a971929c8ed5ef649118a0808950b0b0f645e4 100644 (file)
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -948,13 +948,13 @@ static void macvlan_dev_get_stats64(struct net_device *dev,
                for_each_possible_cpu(i) {
                        p = per_cpu_ptr(vlan->pcpu_stats, i);
                        do {
-                               start = u64_stats_fetch_begin_irq(&p->syncp);
+                               start = u64_stats_fetch_begin(&p->syncp);
                                rx_packets      = u64_stats_read(&p->rx_packets);
                                rx_bytes        = u64_stats_read(&p->rx_bytes);
                                rx_multicast    = u64_stats_read(&p->rx_multicast);
                                tx_packets      = u64_stats_read(&p->tx_packets);
                                tx_bytes        = u64_stats_read(&p->tx_bytes);
-                       } while (u64_stats_fetch_retry_irq(&p->syncp, start));
+                       } while (u64_stats_fetch_retry(&p->syncp, start));
 
                        stats->rx_packets       += rx_packets;
                        stats->rx_bytes         += rx_bytes;