diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-07 13:00:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-07 13:00:11 -0700 |
| commit | b0fb422281c8c09c8dcf03ca44ec343f0ff9df0b (patch) | |
| tree | 85866700657ec97d8eae343146dd61519771f699 /kernel/sched.c | |
| parent | 54d6d5374491387eafe7f6e05e065232071cc4f0 (diff) | |
| parent | 20afc60f892d285fde179ead4b24e6a7938c2f1b (diff) | |
| download | op-kernel-dev-b0fb422281c8c09c8dcf03ca44ec343f0ff9df0b.zip op-kernel-dev-b0fb422281c8c09c8dcf03ca44ec343f0ff9df0b.tar.gz | |
Merge branch 'perf-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip
* 'perf-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip:
x86, perf: Check that current->mm is alive before getting user callchain
perf_event: Fix broken calc_timer_values()
perf events: Fix slow and broken cgroup context switch code
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index ccacdbd..0408cdc 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -3065,7 +3065,7 @@ static void finish_task_switch(struct rq *rq, struct task_struct *prev) #ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW local_irq_disable(); #endif /* __ARCH_WANT_INTERRUPTS_ON_CTXSW */ - perf_event_task_sched_in(current); + perf_event_task_sched_in(prev, current); #ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW local_irq_enable(); #endif /* __ARCH_WANT_INTERRUPTS_ON_CTXSW */ |
