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

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

Merge "msm: move rpm-smd trace event header to new kernel directory"

parents 46e65de9 ced0c963

arch/arm/mach-msm/rpm-smd.c

+2 −2
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ 


#include <mach/msm_smd.h>

#define CREATE_TRACE_POINTS

#include <mach/trace_rpm_smd.h>

/* Debug Definitions */

#include <trace/events/trace_rpm_smd.h>



/* Debug Definitions */

enum {

	MSM_RPM_LOG_REQUEST_PRETTY	= BIT(0),

	MSM_RPM_LOG_REQUEST_RAW		= BIT(1),

arch/arm/mach-msm/include/mach/trace_rpm_smd.h→include/trace/events/trace_rpm_smd.h

+1 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2012, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012, 2014, 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
@@ -73,7 +73,5 @@ TRACE_EVENT(rpm_send_message, 
			__entry->rsc_id, __entry->msg_id)

);

#endif

#undef TRACE_INCLUDE_PATH

#define TRACE_INCLUDE_PATH mach

#define TRACE_INCLUDE_FILE trace_rpm_smd

#include <trace/define_trace.h>