From fa1c60014bfb3209602ce0511f3adf996adcae7c Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Wed, 26 Jun 2019 10:38:42 -0400
Subject: [PATCH] cleanup: include/: move misc/gcov.h to debug/gcov.h

move misc/gcov.h to debug/gcov.h and
create a shim for backward-compatibility.

No functional changes to the headers.
A warning in the shim can be controlled with CONFIG_COMPAT_INCLUDES.

Related to #16539

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---
 include/debug/gcov.h | 19 +++++++++++++++++++
 include/misc/gcov.h  | 16 ++++++----------
 kernel/init.c        |  2 +-
 3 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 include/debug/gcov.h

diff --git a/include/debug/gcov.h b/include/debug/gcov.h
new file mode 100644
index 00000000000..83f2b8bc1ba
--- /dev/null
+++ b/include/debug/gcov.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_INCLUDE_DEBUG_GCOV_H_
+#define ZEPHYR_INCLUDE_DEBUG_GCOV_H_
+
+#ifdef CONFIG_COVERAGE_GCOV
+void gcov_coverage_dump(void);
+void gcov_static_init(void);
+#else
+void gcov_coverage_dump(void) { }
+void gcov_static_init(void) { }
+
+#endif	/* CONFIG_COVERAGE */
+
+#endif	/* ZEPHYR_INCLUDE_DEBUG_GCOV_H_ */
diff --git a/include/misc/gcov.h b/include/misc/gcov.h
index 2288f8e7329..fd494f3d8ae 100644
--- a/include/misc/gcov.h
+++ b/include/misc/gcov.h
@@ -1,19 +1,15 @@
 /*
- * Copyright (c) 2018 Intel Corporation
+ * Copyright (c) 2019 Intel Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
 #ifndef ZEPHYR_INCLUDE_MISC_GCOV_H_
 #define ZEPHYR_INCLUDE_MISC_GCOV_H_
 
-#ifdef CONFIG_COVERAGE_GCOV
-void gcov_coverage_dump(void);
-void gcov_static_init(void);
-#else
-void gcov_coverage_dump(void) { }
-void gcov_static_init(void) { }
+#ifndef CONFIG_COMPAT_INCLUDES
+#warning "This header file has moved, include <debug/gcov.h> instead."
+#endif
 
-#endif	/* CONFIG_COVERAGE */
+#include <debug/gcov.h>
 
-#endif	/* ZEPHYR_INCLUDE_MISC_GCOV_H_ */
+#endif /* ZEPHYR_INCLUDE_MISC_GCOV_H_ */
diff --git a/kernel/init.c b/kernel/init.c
index b90445ada33..b7434094848 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -33,7 +33,7 @@
 #include <logging/log_ctrl.h>
 #include <debug/tracing.h>
 #include <stdbool.h>
-#include <misc/gcov.h>
+#include <debug/gcov.h>
 
 #define IDLE_THREAD_NAME	"idle"
 #define LOG_LEVEL CONFIG_KERNEL_LOG_LEVEL