diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 08:36:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 08:36:40 -0700 |
| commit | 4da7e90e653d67dfd405868246d316b04852e2d5 (patch) | |
| tree | 735707a0b9f0c212776717ec8bc95735ff6a1d01 /include | |
| parent | fb9a7d76da108d120efb2258ea83b18dbbb2ecdd (diff) | |
| parent | fd1edb3aa2c1d92618d8f0c6d15d44ea41fcac6a (diff) | |
| download | linux-3.10-4da7e90e653d67dfd405868246d316b04852e2d5.tar.gz linux-3.10-4da7e90e653d67dfd405868246d316b04852e2d5.tar.bz2 linux-3.10-4da7e90e653d67dfd405868246d316b04852e2d5.zip | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf: Fix task_struct reference leak
perf: Fix task context scheduling
perf: mmap 512 kiB by default
perf: Rebase max unprivileged mlock threshold on top of page size
perf tools: Fix NO_NEWT=1 python build error
perf symbols: Properly align symbol_conf.priv_size
perf tools: Emit clearer message for sys_perf_event_open ENOENT return
perf tools: Fixup exit path when not able to open events
perf symbols: Fix vsyscall symbol lookup
oprofile, x86: Allow setting EDGE/INV/CMASK for counter events
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/perf_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 311b4dc785a..04d75a8a20e 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1086,7 +1086,7 @@ void perf_event_task_sched_out(struct task_struct *task, struct task_struct *nex { perf_sw_event(PERF_COUNT_SW_CONTEXT_SWITCHES, 1, 1, NULL, 0); - COND_STMT(&perf_sched_events, __perf_event_task_sched_out(task, next)); + __perf_event_task_sched_out(task, next); } extern void perf_event_mmap(struct vm_area_struct *vma); |