Merge branch 'oprofile/urgent' into oprofile/core

Conflicts:
	arch/arm/oprofile/common.c

Signed-off-by: Robert Richter <robert.richter@amd.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 791d5109f34c..50d8009be86c 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -63,20 +63,20 @@ static inline bool netpoll_rx(struct sk_buff *skb)
         unsigned long flags;
         bool ret = false;
 
-        rcu_read_lock_bh();
+        local_irq_save(flags);
         npinfo = rcu_dereference_bh(skb->dev->npinfo);
 
         if (!npinfo || (list_empty(&npinfo->rx_np) && !npinfo->rx_flags))
                 goto out;
 
-        spin_lock_irqsave(&npinfo->rx_lock, flags);
+        spin_lock(&npinfo->rx_lock);
         /* check rx_flags again with the lock held */
         if (npinfo->rx_flags && __netpoll_rx(skb))
                 ret = true;
-        spin_unlock_irqrestore(&npinfo->rx_lock, flags);
+        spin_unlock(&npinfo->rx_lock);
 
 out:
-        rcu_read_unlock_bh();
+        local_irq_restore(flags);
         return ret;
 }