Merge commit 'origin/master' into next

Manual merge of:
	arch/powerpc/include/asm/elf.h
	drivers/i2c/busses/i2c-mpc.c

1 files changed, 11 insertions, 0 deletions

diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index e38d3c9dccda..de99025f2c5d 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -63,6 +63,13 @@ static inline int netpoll_rx(struct sk_buff *skb)
         return ret;
 }
 
+static inline int netpoll_rx_on(struct sk_buff *skb)
+{
+        struct netpoll_info *npinfo = skb->dev->npinfo;
+
+        return npinfo && (npinfo->rx_np || npinfo->rx_flags);
+}
+
 static inline int netpoll_receive_skb(struct sk_buff *skb)
 {
         if (!list_empty(&skb->dev->napi_list))
@@ -99,6 +106,10 @@ static inline int netpoll_rx(struct sk_buff *skb)
 {
         return 0;
 }
+static inline int netpoll_rx_on(struct sk_buff *skb)
+{
+        return 0;
+}
 static inline int netpoll_receive_skb(struct sk_buff *skb)
 {
         return 0;