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

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

Merge "tracing: fix call to trace_event_buffer functions"

parents 678d483e 7b54b762

arch/arm64/configs/vendor/kona-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -551,5 +551,4 @@ CONFIG_CORESIGHT_TPDM=y 
CONFIG_CORESIGHT_HWEVENT=y

CONFIG_CORESIGHT_DUMMY=y

CONFIG_CORESIGHT_REMOTE_ETM=y

CONFIG_CORESIGHT_REMOTE_ETM_DEFAULT_ENABLE=0

CONFIG_CORESIGHT_TGU=y

arch/arm64/configs/vendor/kona_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -611,5 +611,4 @@ CONFIG_CORESIGHT_TPDM=y 
CONFIG_CORESIGHT_HWEVENT=y

CONFIG_CORESIGHT_DUMMY=y

CONFIG_CORESIGHT_REMOTE_ETM=y

CONFIG_CORESIGHT_REMOTE_ETM_DEFAULT_ENABLE=0

CONFIG_CORESIGHT_TGU=y

drivers/hwtracing/coresight/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ config CORESIGHT_REMOTE_ETM 
config CORESIGHT_REMOTE_ETM_DEFAULT_ENABLE

	int "default enable ETM for Remote processor based on instance id"

	depends on CORESIGHT_REMOTE_ETM

	default 0

	help

	  Support for enabling separated Remote processor ETM tracing. Depends

	  on if instance id bit is set.

kernel/trace/trace_events.c

+1 −1
Original line number Diff line number Diff line
@@ -3397,7 +3397,7 @@ function_test_events_call(unsigned long ip, unsigned long parent_ip, 
	entry->parent_ip		= parent_ip;



	event_trigger_unlock_commit(&event_trace_file, buffer, event,

				    entry, flags, pc);

				    entry, flags, pc, 0);

 out:

	atomic_dec(&per_cpu(ftrace_test_event_disable, cpu));

	preempt_enable_notrace();

kernel/trace/trace_events_hist.c

+1 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ static notrace void trace_event_raw_event_synth(void *__data, 
		}

	}



	trace_event_buffer_commit(&fbuffer);

	trace_event_buffer_commit(&fbuffer, sizeof(*entry) + fields_size);

out:

	ring_buffer_nest_end(buffer);

}