History

Merge branch 'linus' into perf/core

Conflicts: tools/perf/Makefile tools/perf/builtin-test.c tools/perf/perf.h tools/perf/tests/parse-events.c tools/perf/util/evsel.h

Ingo Molnar committed 13 years ago

Commit f0b9abf2 parents adc1ef1 1b3c3931115 files · +13259 −8000Browse files

Showing the changes to include/trace (1 of 1115 files). Show all

Unified · Split

include/trace/events/xen.h+8−0
@@ -377,6 +377,14 @@ DECLARE_EVENT_CLASS(xen_mmu_pgd, · 376 unmodified lines
377DEFINE_XEN_MMU_PGD_EVENT(xen_mmu_pgd_pin);377DEFINE_XEN_MMU_PGD_EVENT(xen_mmu_pgd_pin);
378DEFINE_XEN_MMU_PGD_EVENT(xen_mmu_pgd_unpin);378DEFINE_XEN_MMU_PGD_EVENT(xen_mmu_pgd_unpin);
379 379
380TRACE_EVENT(xen_mmu_flush_tlb_all,
381 TP_PROTO(int x),
382 TP_ARGS(x),
383 TP_STRUCT__entry(__array(char, x, 0)),
384 TP_fast_assign((void)x),
385 TP_printk("%s", "")
386 );
387
380TRACE_EVENT(xen_mmu_flush_tlb,388TRACE_EVENT(xen_mmu_flush_tlb,
381 TP_PROTO(int x),389 TP_PROTO(int x),
382 TP_ARGS(x),390 TP_ARGS(x),