History

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Thomas Gleixner: "Two fixes for the perf subsystem: - Fix an inconsistency of RDPMC mm struct tagging across exec() which causes RDPMC to fault. - Correct the timestamp mechanics across IOC_DISABLE/ENABLE which causes incorrect timestamps and total time calculations" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/core: Fix time on IOC_ENABLE perf/x86: Fix RDPMC vs. mm_struct tracking

Linus Torvalds committed 9 years ago

Commit e46db8d2 parents 9dae41a 9b231d93 files · +48 −19Browse files

Showing the changes to include/linux (1 of 3 files). Show all

Unified · Split

include/linux/perf_event.h+2−2
@@ -310,8 +310,8 @@ struct pmu { · 309 unmodified lines
310 * Notification that the event was mapped or unmapped. Called310 * Notification that the event was mapped or unmapped. Called
311 * in the context of the mapping task.311 * in the context of the mapping task.
312 */312 */
313 void (*event_mapped) (struct perf_event *event); /*optional*/313 void (*event_mapped) (struct perf_event *event, struct mm_struct *mm); /* optional */
314 void (*event_unmapped) (struct perf_event *event); /*optional*/314 void (*event_unmapped) (struct perf_event *event, struct mm_struct *mm); /* optional */
315 315
316 /*316 /*
317 * Flags for ->add()/->del()/ ->start()/->stop(). There are317 * Flags for ->add()/->del()/ ->start()/->stop(). There are