diff --git a/[refs] b/[refs]
index 592e8c2b7230..4cbb0a301a8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2adae0970ca1db8adb92fb56ae3bcabd916e8bd
+refs/heads/master: 5b6045a906f48d37591365c5dcdd6d1d146bfd4a
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 02d32baa23ac..a3a8a87d7e91 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -808,6 +808,7 @@ void trace_find_cmdline(int pid, char comm[])
 		return;
 	}
 
+	preempt_disable();
 	__raw_spin_lock(&trace_cmdline_lock);
 	map = map_pid_to_cmdline[pid];
 	if (map != NO_CMDLINE_MAP)
@@ -816,6 +817,7 @@ void trace_find_cmdline(int pid, char comm[])
 		strcpy(comm, "<...>");
 
 	__raw_spin_unlock(&trace_cmdline_lock);
+	preempt_enable();
 }
 
 void tracing_record_cmdline(struct task_struct *tsk)