Merge tag 'v3.6-rc4'

Merge 3.6-rc4 to get latest OMAP and device tree fixes.

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 32eb94ece6c1..e2a06fd996d5 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -107,10 +107,10 @@ static struct rtnl_link_stats64 *loopback_get_stats64(struct net_device *dev,
 
                 lb_stats = per_cpu_ptr(dev->lstats, i);
                 do {
-                        start = u64_stats_fetch_begin(&lb_stats->syncp);
+                        start = u64_stats_fetch_begin_bh(&lb_stats->syncp);
                         tbytes = lb_stats->bytes;
                         tpackets = lb_stats->packets;
-                } while (u64_stats_fetch_retry(&lb_stats->syncp, start));
+                } while (u64_stats_fetch_retry_bh(&lb_stats->syncp, start));
                 bytes   += tbytes;
                 packets += tpackets;
         }