Merge branch 'master' into percpu

2010-02-02 14:38:15 +09:00
parent dbfc196a3c ab658321f3
commit ab386128f2
1258 changed files with 33261 additions and 12809 deletions
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -951,6 +951,11 @@ void trace_find_cmdline(int pid, char comm[])
 		return;
 	}

+	if (WARN_ON_ONCE(pid < 0)) {
+		strcpy(comm, "<XXX>");
+		return;
+	}
+
 	if (pid > PID_MAX_DEFAULT) {
 		strcpy(comm, "<...>");
 		return;