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

Commit 9c186765 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: fix active clients logging timestamp"

parents ab4e0f5c 6bf15469

drivers/platform/msm/ipa/ipa_v2/ipa.c

+3 −3
Original line number Diff line number Diff line
@@ -2945,7 +2945,7 @@ void ipa2_inc_client_enable_clks(struct ipa2_active_client_logging_info *id) 


	ipa_active_clients_lock();

	if (id->type != SIMPLE) {

		t = cpu_clock(smp_processor_id());

		t = local_clock();

		nanosec_rem = do_div(t, 1000000000) / 1000;

		snprintf(temp_str, IPA2_ACTIVE_CLIENTS_LOG_LINE_LEN,

					"[%5lu.%06lu] ^ %s, %s: %d",
@@ -2989,7 +2989,7 @@ int ipa2_inc_client_enable_clks_no_block(struct ipa2_active_client_logging_info 
	}



	if (id->type != SIMPLE) {

		t = cpu_clock(smp_processor_id());

		t = local_clock();

		nanosec_rem = do_div(t, 1000000000) / 1000;

		snprintf(temp_str, IPA2_ACTIVE_CLIENTS_LOG_LINE_LEN,

					"[%5lu.%06lu] ^ %s, %s: %d",
@@ -3028,7 +3028,7 @@ void ipa2_dec_client_disable_clks(struct ipa2_active_client_logging_info *id) 


	ipa_active_clients_lock();

	if (id->type != SIMPLE) {

		t = cpu_clock(smp_processor_id());

		t = local_clock();

		nanosec_rem = do_div(t, 1000000000) / 1000;

		snprintf(temp_str, IPA2_ACTIVE_CLIENTS_LOG_LINE_LEN,

					"[%5lu.%06lu] v %s, %s: %d",

drivers/platform/msm/ipa/ipa_v3/ipa.c

+3 −3
Original line number Diff line number Diff line
@@ -2966,7 +2966,7 @@ void ipa3_inc_client_enable_clks(struct ipa3_active_client_logging_info *id) 
	ipa3_active_clients_lock();



	if (id->type != SIMPLE) {

		t = cpu_clock(smp_processor_id());

		t = local_clock();

		nanosec_rem = do_div(t, 1000000000) / 1000;

		snprintf(temp_str, IPA3_ACTIVE_CLIENTS_LOG_LINE_LEN,

					"[%5lu.%06lu] ^ %s, %s: %d",
@@ -3007,7 +3007,7 @@ int ipa3_inc_client_enable_clks_no_block(struct ipa3_active_client_logging_info 
	}



	if (id->type != SIMPLE) {

		t = cpu_clock(smp_processor_id());

		t = local_clock();

		nanosec_rem = do_div(t, 1000000000) / 1000;

		snprintf(temp_str, IPA3_ACTIVE_CLIENTS_LOG_LINE_LEN,

				"[%5lu.%06lu] ^ %s, %s: %d",
@@ -3043,7 +3043,7 @@ void ipa3_dec_client_disable_clks(struct ipa3_active_client_logging_info *id) 


	ipa3_active_clients_lock();

	if (id->type != SIMPLE) {

		t = cpu_clock(smp_processor_id());

		t = local_clock();

		nanosec_rem = do_div(t, 1000000000) / 1000;

		snprintf(temp_str, IPA3_ACTIVE_CLIENTS_LOG_LINE_LEN,

				"[%5lu.%06lu] v %s, %s: %d",