diff options
author | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-04-04 22:13:35 +0200 |
---|---|---|
committer | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-04-04 22:13:35 +0200 |
commit | fe5f31a8010a0cb13e72cfb72905fefa2a41730c (patch) | |
tree | 324d237e47092cc66b13c7421dbda6ea6961c6b4 /include/trace | |
parent | a88b5f38338db9cf2b8868e3645c30da655ac139 (diff) | |
parent | 91ab883eb21325ad80f3473633f794c78ac87f51 (diff) | |
download | linux-fe5f31a8010a0cb13e72cfb72905fefa2a41730c.tar.gz linux-fe5f31a8010a0cb13e72cfb72905fefa2a41730c.tar.bz2 linux-fe5f31a8010a0cb13e72cfb72905fefa2a41730c.zip |
Merge tag 'v4.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mtd/next
Backmerge v4.16-rc2 into mtd/next to resolve a conflict between Linus'
master branch and nand/for-4.17.
Diffstat (limited to 'include/trace')
-rw-r--r-- | include/trace/events/xen.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/events/xen.h b/include/trace/events/xen.h index b8adf05c534e..7dd8f34c37df 100644 --- a/include/trace/events/xen.h +++ b/include/trace/events/xen.h @@ -368,7 +368,7 @@ TRACE_EVENT(xen_mmu_flush_tlb, TP_printk("%s", "") ); -TRACE_EVENT(xen_mmu_flush_tlb_single, +TRACE_EVENT(xen_mmu_flush_tlb_one_user, TP_PROTO(unsigned long addr), TP_ARGS(addr), TP_STRUCT__entry( |