diff --git a/[refs] b/[refs]
index d131be732e2d..497d3179784b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd0980fc8add25e8ab12fcf1051c0f20cbc7c0c0
+refs/heads/master: cc3b13c11c567c69a6356be98d0c03ff11541d5c
diff --git a/trunk/kernel/tracepoint.c b/trunk/kernel/tracepoint.c
index 1a6a453b7efb..9489a0a9b1be 100644
--- a/trunk/kernel/tracepoint.c
+++ b/trunk/kernel/tracepoint.c
@@ -597,7 +597,9 @@ void syscall_regfunc(void)
 	if (!sys_tracepoint_refcount) {
 		read_lock_irqsave(&tasklist_lock, flags);
 		do_each_thread(g, t) {
-			set_tsk_thread_flag(t, TIF_SYSCALL_TRACEPOINT);
+			/* Skip kernel threads. */
+			if (t->mm)
+				set_tsk_thread_flag(t, TIF_SYSCALL_TRACEPOINT);
 		} while_each_thread(g, t);
 		read_unlock_irqrestore(&tasklist_lock, flags);
 	}