From a79b2317db1ce28bb2cc5c9c32bdff64df51bfc6 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Tue, 26 May 2009 17:28:02 +0200 Subject: [PATCH] --- yaml --- r: 146186 b: refs/heads/master c: 5b6045a906f48d37591365c5dcdd6d1d146bfd4a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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)