---

yaml --- r: 361834 b: refs/heads/master c: 9979a55 h: refs/heads/master v: v3
git-mirror · Mar 24, 2013 · 46ee169 · 46ee169
1 parent 4c0e08a
commit 46ee169
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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);
-Original file line number
+Diff line change
@@ Expand Up / @@ -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);
@@ Expand Down @@