Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91083098 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "trace: events: fix trace events used by secure cma allocations"

parents 19ab7019 af7a7c86

include/trace/events/kmem.h

+9 −21
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -727,96 +727,84 @@ DECLARE_EVENT_CLASS(ion_secure_cma_allocate, 


	TP_PROTO(const char *heap_name,

		unsigned long len,

		unsigned long align,

		unsigned long flags),



	TP_ARGS(heap_name, len, align, flags),

	TP_ARGS(heap_name, len, flags),



	TP_STRUCT__entry(

		__field(const char *, heap_name)

		__field(unsigned long, len)

		__field(unsigned long, align)

		__field(unsigned long, flags)

		),



	TP_fast_assign(

		__entry->heap_name = heap_name;

		__entry->len = len;

		__entry->align = align;

		__entry->flags = flags;

		),



	TP_printk("heap_name=%s len=%lx align=%lx flags=%lx",

	TP_printk("heap_name=%s len=%lx flags=%lx",

		__entry->heap_name,

		__entry->len,

		__entry->align,

		__entry->flags)

	);



DEFINE_EVENT(ion_secure_cma_allocate, ion_secure_cma_allocate_start,

	TP_PROTO(const char *heap_name,

		unsigned long len,

		unsigned long align,

		unsigned long flags),



	TP_ARGS(heap_name, len, align, flags)

	TP_ARGS(heap_name, len, flags)

	);



DEFINE_EVENT(ion_secure_cma_allocate, ion_secure_cma_allocate_end,

	TP_PROTO(const char *heap_name,

		unsigned long len,

		unsigned long align,

		unsigned long flags),



	TP_ARGS(heap_name, len, align, flags)

	TP_ARGS(heap_name, len, flags)

	);



DECLARE_EVENT_CLASS(ion_cp_secure_buffer,



	TP_PROTO(const char *heap_name,

		unsigned long len,

		unsigned long align,

		unsigned long flags),



	TP_ARGS(heap_name, len, align, flags),

	TP_ARGS(heap_name, len, flags),



	TP_STRUCT__entry(

		__field(const char *, heap_name)

		__field(unsigned long, len)

		__field(unsigned long, align)

		__field(unsigned long, flags)

		),



	TP_fast_assign(

		__entry->heap_name = heap_name;

		__entry->len = len;

		__entry->align = align;

		__entry->flags = flags;

		),



	TP_printk("heap_name=%s len=%lx align=%lx flags=%lx",

	TP_printk("heap_name=%s len=%lx flags=%lx",

		__entry->heap_name,

		__entry->len,

		__entry->align,

		__entry->flags)

	);



DEFINE_EVENT(ion_cp_secure_buffer, ion_cp_secure_buffer_start,

	TP_PROTO(const char *heap_name,

		unsigned long len,

		unsigned long align,

		unsigned long flags),



	TP_ARGS(heap_name, len, align, flags)

	TP_ARGS(heap_name, len, flags)

	);



DEFINE_EVENT(ion_cp_secure_buffer, ion_cp_secure_buffer_end,

	TP_PROTO(const char *heap_name,

		unsigned long len,

		unsigned long align,

		unsigned long flags),



	TP_ARGS(heap_name, len, align, flags)

	TP_ARGS(heap_name, len, flags)

	);



DECLARE_EVENT_CLASS(iommu_sec_ptbl_map_range,