From 46ee169362e46d694f65877e9daf195385ccf796 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Fri, 22 Mar 2013 14:38:28 +0000
Subject: [PATCH] --- yaml --- r: 361834 b: refs/heads/master c:
 9979a55a833883242e3a29f3596676edd7199c46 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5e7c332b70ef..acfdd543857a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4541d60a449afd40448b06496dcd510f505928e
+refs/heads/master: 9979a55a833883242e3a29f3596676edd7199c46
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index d540ced1f6c6..b13e5c766c11 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1545,7 +1545,6 @@ void net_enable_timestamp(void)
 		return;
 	}
 #endif
-	WARN_ON(in_interrupt());
 	static_key_slow_inc(&netstamp_needed);
 }
 EXPORT_SYMBOL(net_enable_timestamp);