---

yaml --- r: 187873 b: refs/heads/master c: b634587 h: refs/heads/master i: 187871: f5ebde9 v: v3
git-mirror · Mar 13, 2010 · d45241e · d45241e
1 parent 792a97b
commit d45241e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2f8071428ed9a0f06865f417c962421c9a6b488
+refs/heads/master: b6345879ccbd9b92864fbd7eb8ac48acdb4d6b15
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
@@ -1284,6 +1284,13 @@ ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags, int pc)
 	if (!(trace_flags & TRACE_ITER_USERSTACKTRACE))
 		return;
 
+	/*
+	 * NMIs can not handle page faults, even with fix ups.
+	 * The save user stack can (and often does) fault.
+	 */
+	if (unlikely(in_nmi()))
+		return;
+
 	event = trace_buffer_lock_reserve(buffer, TRACE_USER_STACK,
 					  sizeof(*entry), flags, pc);
 	if (!event)