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

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

Merge changes I7d5c0c52,I8a80e230 into msm-next 

* changes:
  defconfig: sdm855: Enable IPC Logging
  trace: ipc_logging: Remove unnecesary bounds check
parents 59e58e16 a6b19407

arch/arm64/configs/sdm855-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_PANIC_TIMEOUT=5

CONFIG_SCHEDSTATS=y

# CONFIG_DEBUG_PREEMPT is not set

CONFIG_IPC_LOGGING=y

CONFIG_DEBUG_ALIGN_RODATA=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

arch/arm64/configs/sdm855_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -419,6 +419,7 @@ CONFIG_FAIL_PAGE_ALLOC=y 
CONFIG_UFS_FAULT_INJECTION=y

CONFIG_FAULT_INJECTION_DEBUG_FS=y

CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y

CONFIG_IPC_LOGGING=y

CONFIG_FUNCTION_TRACER=y

CONFIG_TRACER_SNAPSHOT=y

CONFIG_BLK_DEV_IO_TRACE=y

kernel/trace/ipc_logging.c

+1 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/wait.h>

#include <linux/delay.h>

#include <linux/completion.h>

#include <linux/sched/clock.h>

#include <linux/ipc_logging.h>



#include "ipc_logging_private.h"
@@ -364,8 +365,6 @@ void msg_encode_end(struct encode_context *ectxt) 


	/* finalize data size */

	ectxt->hdr.size = ectxt->offset - sizeof(ectxt->hdr);

	if (WARN_ON(ectxt->hdr.size > MAX_MSG_SIZE))

		return;

	memcpy(ectxt->buff, &ectxt->hdr, sizeof(ectxt->hdr));

}

EXPORT_SYMBOL(msg_encode_end);