X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fperf_event.h;h=ee9f1e7828001f26a5657962040277cb6e574795;hb=c98ece69fecf246b9e168f4ddd7d90de4027b298;hp=311b4dc785a19b5188cdd32260b50041d3403cc6;hpb=e9c4a5e10e063647b12e393dd3149c95175fd5ff;p=pandora-kernel.git diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 311b4dc785a1..ee9f1e782800 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -662,7 +662,7 @@ struct pmu { int (*commit_txn) (struct pmu *pmu); /* optional */ /* * Will cancel the transaction, assumes ->del() is called - * for each successfull ->add() during the transaction. + * for each successful ->add() during the transaction. */ void (*cancel_txn) (struct pmu *pmu); /* optional */ }; @@ -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);