---

yaml --- r: 158412 b: refs/heads/master c: 07868b0 h: refs/heads/master v: v3
git-mirror · Aug 6, 2009 · 3826951 · 3826951
1 parent 7be40a5
commit 3826951
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c9e6f639aed490202bbc79214f4495cf4bfde58
+refs/heads/master: 07868b086cca784f4b532fc2ab574ec3a73b468a
diff --git a/trunk/arch/x86/kernel/ftrace.c b/trunk/arch/x86/kernel/ftrace.c
@@ -417,10 +417,6 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr,
 	unsigned long return_hooker = (unsigned long)
 				&return_to_handler;
 
-	/* Nmi's are currently unsupported */
-	if (unlikely(in_nmi()))
-		return;
-
 	if (unlikely(atomic_read(&current->tracing_graph_pause)))
 		return;