From e99d0d64927da13e545aef252b5ad69507cf9a14 Mon Sep 17 00:00:00 2001 From: Jordan Crouse Date: Tue, 14 Apr 2020 14:31:06 -0600 Subject: [PATCH] soc: qcom: hyp_core_ctl: Move the trace file to the local directory The hyp_core_ctl trace file uses a structure that is only defined internally in the file so it does not pass KERNEL_HEADER_TEST in the global header location. Since it is only used by this one file it can be safely moved to the local directory. Change-Id: Ic0dedbad4285ffcc750839ebc673029193733437 Signed-off-by: Jordan Crouse --- drivers/soc/qcom/hyp_core_ctl.c | 2 +- .../hyp_core_ctl.h => drivers/soc/qcom/hyp_core_ctl_trace.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) rename include/trace/events/hyp_core_ctl.h => drivers/soc/qcom/hyp_core_ctl_trace.h (90%) diff --git a/drivers/soc/qcom/hyp_core_ctl.c b/drivers/soc/qcom/hyp_core_ctl.c index c32ff009e79e..b6502060375c 100644 --- a/drivers/soc/qcom/hyp_core_ctl.c +++ b/drivers/soc/qcom/hyp_core_ctl.c @@ -73,7 +73,7 @@ struct hyp_core_ctl_data { }; #define CREATE_TRACE_POINTS -#include +#include "hyp_core_ctl_trace.h" static struct hyp_core_ctl_data *the_hcd; static struct hyp_core_ctl_cpu_map hh_cpumap[NR_CPUS]; diff --git a/include/trace/events/hyp_core_ctl.h b/drivers/soc/qcom/hyp_core_ctl_trace.h similarity index 90% rename from include/trace/events/hyp_core_ctl.h rename to drivers/soc/qcom/hyp_core_ctl_trace.h index 6aafbdcfe2e6..5f4a1384d2a4 100644 --- a/include/trace/events/hyp_core_ctl.h +++ b/drivers/soc/qcom/hyp_core_ctl_trace.h @@ -1,10 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - *Copyright (c) 2018 The Linux Foundation. All rights reserved. + *Copyright (c) 2018,2020 The Linux Foundation. All rights reserved. */ #undef TRACE_SYSTEM #define TRACE_SYSTEM hyp_core_ctl +#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH . +#undef TRACE_INCLUDE_FILE +#define TRACE_INCLUDE_FILE hyp_core_ctl_trace #if !defined(_TRACE_HYP_CORE_CTL_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_HYP_CORE_CTL_H