* '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
Showing the changes to include (1 of 12 files). Show all
Unified · Split
| @@ -1086,7 +1086,7 @@ void perf_event_task_sched_out(struct task_struct *task, struct task_struct *nex · 1085 unmodified lines | ||
| 1086 | 1086 | { |
| 1087 | 1087 | perf_sw_event(PERF_COUNT_SW_CONTEXT_SWITCHES, 1, 1, NULL, 0); |
| 1088 | 1088 | |
| 1089 | − COND_STMT(&perf_sched_events, __perf_event_task_sched_out(task, next)); | |
| 1089 | + __perf_event_task_sched_out(task, next); | |
| 1090 | 1090 | } |
| 1091 | 1091 | |
| 1092 | 1092 | extern void perf_event_mmap(struct vm_area_struct *vma); |