Merge branch develop-3.10 into develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / drivers / staging / android / trace / ion.h

diff --git a/drivers/staging/android/trace/ion.h b/drivers/staging/android/trace/ion.h
index 2dcc34cf2a815094f48e0e6f86282245df2d2917..67bf9d322d46cae973efb655d244b71a6a52abc3 100644 (file)
--- a/drivers/staging/android/trace/ion.h
+++ b/drivers/staging/android/trace/ion.h
@@ -8,11 +8,11 @@
 #include <linux/tracepoint.h>
 
 DECLARE_EVENT_CLASS(ion_buffer_op,
-       TP_PROTO(const char* client, unsigned int buf, unsigned int size),
+       TP_PROTO(const char* client, void* buf, unsigned int size),
        TP_ARGS(client, buf, size),
        TP_STRUCT__entry(
                __string(client, client)
-               __field(unsigned int, buf)
+               __field(void*, buf)
                __field(unsigned int, size)
        ),
        TP_fast_assign(
@@ -20,35 +20,35 @@ DECLARE_EVENT_CLASS(ion_buffer_op,
                __entry->buf = buf;
                __entry->size = size;
        ),
-       TP_printk("client=%s,buffer=%08x:%d",
+       TP_printk("client=%s,buffer=%p:%d",
                  __get_str(client), __entry->buf, __entry->size)
 );
 DEFINE_EVENT(ion_buffer_op, ion_buffer_alloc,
-       TP_PROTO(const char* client, unsigned int buffer, unsigned int size),
+       TP_PROTO(const char* client, void* buffer, unsigned int size),
        TP_ARGS(client, buffer, size));
 
 DEFINE_EVENT(ion_buffer_op, ion_buffer_free,
-       TP_PROTO(const char* client, unsigned int buffer, unsigned int size),
+       TP_PROTO(const char* client, void* buffer, unsigned int size),
        TP_ARGS(client, buffer, size));
 
 DEFINE_EVENT(ion_buffer_op, ion_buffer_import,
-       TP_PROTO(const char* client, unsigned int buffer, unsigned int size),
+       TP_PROTO(const char* client, void* buffer, unsigned int size),
        TP_ARGS(client, buffer, size));
 
 DEFINE_EVENT(ion_buffer_op, ion_buffer_destroy,
-       TP_PROTO(const char* client, unsigned int buffer, unsigned int size),
+       TP_PROTO(const char* client, void* buffer, unsigned int size),
        TP_ARGS(client, buffer, size));
 
 DEFINE_EVENT(ion_buffer_op, ion_kernel_unmap,
-       TP_PROTO(const char* client, unsigned int buffer, unsigned int size),
+       TP_PROTO(const char* client, void* buffer, unsigned int size),
        TP_ARGS(client, buffer, size));
 
 TRACE_EVENT(ion_buffer_share,
-       TP_PROTO(const char* client, unsigned int buf, unsigned int size, int fd),
+       TP_PROTO(const char* client, void* buf, unsigned int size, int fd),
        TP_ARGS(client, buf, size, fd),
        TP_STRUCT__entry(
                __string(client, client)
-               __field(unsigned int, buf)
+               __field(void*, buf)
                __field(unsigned int, size)
                __field(int, fd)
        ),
@@ -58,7 +58,7 @@ TRACE_EVENT(ion_buffer_share,
                __entry->size = size;
                __entry->fd = fd;
        ),
-       TP_printk("client=%s,buffer=%08x:%d,fd=%d",
+       TP_printk("client=%s,buffer=%p:%d,fd=%d",
                  __get_str(client), __entry->buf, __entry->size, __entry->fd)
 );
 
@@ -81,13 +81,13 @@ DEFINE_EVENT(ion_client_op, ion_client_destroy,
        TP_ARGS(client));
 
 DECLARE_EVENT_CLASS(ion_iommu_op,
-       TP_PROTO(const char* client, unsigned int buf, unsigned int size,
+       TP_PROTO(const char* client, void* buf, unsigned int size,
                const char* iommu_dev, unsigned int iommu_addr,
                unsigned int iommu_size, unsigned int map_cnt),
        TP_ARGS(client, buf, size, iommu_dev, iommu_addr, iommu_size, map_cnt),
        TP_STRUCT__entry(
                __string(client, client)
-               __field(unsigned int, buf)
+               __field(void*, buf)
                __field(unsigned int, size)
                __string(iommu_dev, iommu_dev)
                __field(unsigned int, iommu_addr)
@@ -103,35 +103,35 @@ DECLARE_EVENT_CLASS(ion_iommu_op,
                __entry->iommu_size = iommu_size;
                __entry->map_cnt = map_cnt;
        ),
-       TP_printk("client=%s,buffer=%08x:%d,iommu=%s,map=%08x:%d,map_count=%d",
+       TP_printk("client=%s,buffer=%p:%d,iommu=%s,map=%08x:%d,map_count=%d",
                  __get_str(client), __entry->buf, __entry->size,
                  __get_str(iommu_dev), __entry->iommu_addr, __entry->iommu_size,
                  __entry->map_cnt)
 );
 DEFINE_EVENT(ion_iommu_op, ion_iommu_map,
-       TP_PROTO(const char* client, unsigned int buf, unsigned int size,
+       TP_PROTO(const char* client, void* buf, unsigned int size,
                const char* iommu_dev, unsigned int iommu_addr,
                unsigned int iommu_size, unsigned int map_cnt),
        TP_ARGS(client, buf, size, iommu_dev, iommu_addr, iommu_size, map_cnt));
 DEFINE_EVENT(ion_iommu_op, ion_iommu_unmap,
-       TP_PROTO(const char* client, unsigned int buf, unsigned int size,
+       TP_PROTO(const char* client, void* buf, unsigned int size,
                const char* iommu_dev, unsigned int iommu_addr,
                unsigned int iommu_size, unsigned int map_cnt),
        TP_ARGS(client, buf, size, iommu_dev, iommu_addr, iommu_size, map_cnt));
 DEFINE_EVENT(ion_iommu_op, ion_iommu_release,
-       TP_PROTO(const char* client, unsigned int buf, unsigned int size,
+       TP_PROTO(const char* client, void* buf, unsigned int size,
                const char* iommu_dev, unsigned int iommu_addr,
                unsigned int iommu_size, unsigned int map_cnt),
        TP_ARGS(client, buf, size, iommu_dev, iommu_addr, iommu_size, map_cnt));
 
 DECLARE_EVENT_CLASS(ion_kmap_op,
-       TP_PROTO(const char* client, unsigned int buf, unsigned int size, unsigned int kaddr),
+       TP_PROTO(const char* client, void* buf, unsigned int size, void* kaddr),
        TP_ARGS(client, buf, size, kaddr),
        TP_STRUCT__entry(
                __string(client, client)
-               __field(unsigned int, buf)
+               __field(void*, buf)
                __field(unsigned int, size)
-               __field(unsigned int, kaddr)
+               __field(void*, kaddr)
        ),
        TP_fast_assign(
                __assign_str(client, client);
@@ -139,11 +139,11 @@ DECLARE_EVENT_CLASS(ion_kmap_op,
                __entry->size = size;
                __entry->kaddr = kaddr;
        ),
-       TP_printk("client=%s,buffer=%08x:%d,kaddr=%08x",
+       TP_printk("client=%s,buffer=%p:%d,kaddr=%p",
                  __get_str(client), __entry->buf, __entry->size, __entry->kaddr)
 );
 DEFINE_EVENT(ion_kmap_op, ion_kernel_map,
-       TP_PROTO(const char* client, unsigned int buffer, unsigned int size, unsigned int kaddr),
+       TP_PROTO(const char* client, void* buffer, unsigned int size, void* kaddr),
        TP_ARGS(client, buffer, size, kaddr));
 
 DECLARE_EVENT_CLASS(ion_mmap_op,