History

Merge branch 'perf/urgent' into perf/core to fix conflicts

Conflicts: tools/perf/bench/numa.c

Ingo Molnar committed 13 years ago

Commit 2a3ede82 parents 0e73453 215432e83 files · +729 −681Browse files

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

Unified · Split

include/uapi/linux/perf_event.h+7−5
@@ -479,13 +479,15 @@ struct perf_event_mmap_page { · 478 unmodified lines
479 /*479 /*
480 * Control data for the mmap() data buffer.480 * Control data for the mmap() data buffer.
481 *481 *
482 * User-space reading the @data_head value should issue an rmb(), on482 * User-space reading the @data_head value should issue an smp_rmb(),
483 * SMP capable platforms, after reading this value -- see483 * after reading this value.
484 * perf_event_wakeup().
485 *484 *
486 * When the mapping is PROT_WRITE the @data_tail value should be485 * When the mapping is PROT_WRITE the @data_tail value should be
487 * written by userspace to reflect the last read data. In this case486 * written by userspace to reflect the last read data, after issueing
488 * the kernel will not over-write unread data.487 * an smp_mb() to separate the data read from the ->data_tail store.
488 * In this case the kernel will not over-write unread data.
489 *
490 * See perf_output_put_handle() for the data ordering.
489 */491 */
490 __u64 data_head; /* head in the data section */492 __u64 data_head; /* head in the data section */
491 __u64 data_tail; /* user-space written tail */493 __u64 data_tail; /* user-space written tail */