Merge "coresight: add stm logging to support optimization in trace printk" (d2f1b96a) · Commits · e / devices / android_kernel_sony_msm8994

kernel/trace/trace.c

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -383,8 +383,11 @@ int __trace_puts(unsigned long ip, const char *str, int size)
	if (entry->buf[size - 1] != '\n') {		if (entry->buf[size - 1] != '\n') {
	entry->buf[size] = '\n';		entry->buf[size] = '\n';
	entry->buf[size + 1] = '\0';		entry->buf[size + 1] = '\0';
	} else		stm_log(OST_ENTITY_TRACE_PRINTK, entry->buf, size + 2);
			} else {
	entry->buf[size] = '\0';		entry->buf[size] = '\0';
			stm_log(OST_ENTITY_TRACE_PRINTK, entry->buf, size + 1);
			}

	__buffer_unlock_commit(buffer, event);		__buffer_unlock_commit(buffer, event);

	@@ -415,6 +418,7 @@ int __trace_bputs(unsigned long ip, const char *str)
	entry = ring_buffer_event_data(event);		entry = ring_buffer_event_data(event);
	entry->ip = ip;		entry->ip = ip;
	entry->str = str;		entry->str = str;
			stm_log(OST_ENTITY_TRACE_PRINTK, entry->str, strlen(entry->str)+1);

	__buffer_unlock_commit(buffer, event);		__buffer_unlock_commit(buffer, event);