---

yaml --- r: 156747 b: refs/heads/master c: 94d5d1b h: refs/heads/master i: 156745: c998aab 156743: 6d56c81 v: v3
git-mirror · Aug 13, 2009 · 7912aa3 · 7912aa3
1 parent 7e59a20
commit 7912aa3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 970892a9031a5dc7217bd394fb9d89fa75a4a7bc
+refs/heads/master: 94d5d1b2d891f1fd5205f978246b7864d998b25c
diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
@@ -3028,10 +3028,10 @@ static void perf_counter_task_output(struct perf_counter *counter,
 		return;
 
 	task_event->event.pid = perf_counter_pid(counter, task);
-	task_event->event.ppid = perf_counter_pid(counter, task->real_parent);
+	task_event->event.ppid = perf_counter_pid(counter, current);
 
 	task_event->event.tid = perf_counter_tid(counter, task);
-	task_event->event.ptid = perf_counter_tid(counter, task->real_parent);
+	task_event->event.ptid = perf_counter_tid(counter, current);
 
 	perf_output_put(&handle, task_event->event);
 	perf_output_end(&handle);