From 02adccdbb4d39b128a49ad64a31dfce2f775b171 Mon Sep 17 00:00:00 2001
From: Dongdong Deng <dongdong.deng@windriver.com>
Date: Fri, 21 Aug 2009 03:33:36 +0000
Subject: [PATCH] --- yaml --- r: 157028 b: refs/heads/master c:
 79b1bee888d43b14cf0c08fb8e5aa6cb161e48f8 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/core/netpoll.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3f775fcb35ae..df2dfc635778 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c189308bd8b6a29b11c3ec29a42a3f0aabad6bc8
+refs/heads/master: 79b1bee888d43b14cf0c08fb8e5aa6cb161e48f8
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
index df30feb2fc72..1b76eb11deb4 100644
--- a/trunk/net/core/netpoll.c
+++ b/trunk/net/core/netpoll.c
@@ -319,6 +319,11 @@ static void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
 
 			udelay(USEC_PER_POLL);
 		}
+
+		WARN_ONCE(!irqs_disabled(),
+			"netpoll_send_skb(): %s enabled interrupts in poll (%pF)\n",
+			dev->name, ops->ndo_start_xmit);
+
 		local_irq_restore(flags);
 	}