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

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

Merge "msm: msm: move PM trace event header to new kernel directory"

parents 3bbd3b65 204ebec0

arch/arm/mach-msm/msm-pm.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include "pm-boot.h"



#define CREATE_TRACE_POINTS

#include <mach/trace_msm_low_power.h>

#include <trace/events/trace_msm_low_power.h>



#define SCM_CMD_TERMINATE_PC	(0x2)

#define SCM_CMD_CORE_HOTPLUGGED (0x10)

arch/arm/mach-msm/include/mach/trace_msm_low_power.h→include/trace/events/trace_msm_low_power.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
@@ -148,7 +148,5 @@ TRACE_EVENT(lpm_resources, 
			__entry->sleep_value)

);

#endif

#undef TRACE_INCLUDE_PATH

#define TRACE_INCLUDE_PATH mach

#define TRACE_INCLUDE_FILE trace_msm_low_power

#include <trace/define_trace.h>