diff options
| author | Patrick Daly <pdaly@codeaurora.org> | 2016-02-16 15:55:09 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:10:55 -0700 |
| commit | 86a828d8207435b6c2266c06ed6578c64b0afa9e (patch) | |
| tree | 43e0dc32d6b37692e7dea80dc18ed79e2613c1df /include/trace | |
| parent | 0ff886d8f4f98efa045f9d80fcef3832a56521ff (diff) | |
iommu: Sync files for kernel upgrade
Reset the following files:
arm-smmu.c
iommu.c
include/linux/iommu.h
include/trace/events/iommu.h
to the git merge base between 3.18 and 4.4:
b2776bf7149bddd1f4161f14f79520f17fc1d71d
Change-Id: I9aa58e08125e3a72d1e9742e26d4a6fab34b0ed5
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/iommu.h | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/include/trace/events/iommu.h b/include/trace/events/iommu.h index 2c7befb10f13..a8f5c32d174b 100644 --- a/include/trace/events/iommu.h +++ b/include/trace/events/iommu.h @@ -83,7 +83,7 @@ DEFINE_EVENT(iommu_device_event, detach_device_from_domain, TP_ARGS(dev) ); -TRACE_EVENT(map, +DECLARE_EVENT_CLASS(iommu_map_unmap, TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size), @@ -92,7 +92,7 @@ TRACE_EVENT(map, TP_STRUCT__entry( __field(u64, iova) __field(u64, paddr) - __field(size_t, size) + __field(int, size) ), TP_fast_assign( @@ -101,31 +101,26 @@ TRACE_EVENT(map, __entry->size = size; ), - TP_printk("IOMMU: iova=0x%016llx paddr=0x%016llx size=%zu", + TP_printk("IOMMU: iova=0x%016llx paddr=0x%016llx size=0x%x", __entry->iova, __entry->paddr, __entry->size ) ); -TRACE_EVENT(unmap, +DEFINE_EVENT(iommu_map_unmap, map, - TP_PROTO(unsigned long iova, size_t size, size_t unmapped_size), + TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size), - TP_ARGS(iova, size, unmapped_size), + TP_ARGS(iova, paddr, size) +); - TP_STRUCT__entry( - __field(u64, iova) - __field(size_t, size) - __field(size_t, unmapped_size) - ), +DEFINE_EVENT_PRINT(iommu_map_unmap, unmap, - TP_fast_assign( - __entry->iova = iova; - __entry->size = size; - __entry->unmapped_size = unmapped_size; - ), + TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size), + + TP_ARGS(iova, paddr, size), - TP_printk("IOMMU: iova=0x%016llx size=%zu unmapped_size=%zu", - __entry->iova, __entry->size, __entry->unmapped_size + TP_printk("IOMMU: iova=0x%016llx size=0x%x", + __entry->iova, __entry->size ) ); |