From 7912aa34a00296d4904afb5956a83d76d3dd0696 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Thu, 13 Aug 2009 16:14:42 +0200 Subject: [PATCH] --- yaml --- r: 156747 b: refs/heads/master c: 94d5d1b2d891f1fd5205f978246b7864d998b25c h: refs/heads/master i: 156745: c998aab928d07e642f155ed385fcf227aa782d7b 156743: 6d56c8171ccc6774339f9aec586df3dbc052f291 v: v3 --- [refs] | 2 +- trunk/kernel/perf_counter.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 522b1cedba89..181aa83c444d 100644 --- 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 index 3f841beefc7b..534e20d14d63 100644 --- 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);