From d1f50122f97304a37137ef12b067c4d39e4708b6 Mon Sep 17 00:00:00 2001 From: Andrew Boie Date: Thu, 6 Feb 2020 14:25:37 -0800 Subject: [PATCH] kernel: move timing externs to public header These arch_timing_ defines get used in certain timer drivers and need to be in the public include space, and not the private kernel headers. Signed-off-by: Andrew Boie --- include/sys/arch_interface.h | 21 +++++++++++++++++++++ kernel/include/kernel_arch_interface.h | 23 ----------------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/include/sys/arch_interface.h b/include/sys/arch_interface.h index b883c3b80ca..b60827c0678 100644 --- a/include/sys/arch_interface.h +++ b/include/sys/arch_interface.h @@ -641,6 +641,27 @@ size_t arch_user_string_nlen(const char *s, size_t maxsize, int *err); /** @} */ +/** + * @defgroup arch-benchmarking Architecture-specific benchmarking globals + * @ingroup arch-interface + * @{ + */ + +#ifdef CONFIG_EXECUTION_BENCHMARKING +extern u64_t arch_timing_swap_start; +extern u64_t arch_timing_swap_end; +extern u64_t arch_timing_irq_start; +extern u64_t arch_timing_irq_end; +extern u64_t arch_timing_tick_start; +extern u64_t arch_timing_tick_end; +extern u64_t arch_timing_user_mode_end; +extern u32_t arch_timing_value_swap_end; +extern u64_t arch_timing_value_swap_common; +extern u64_t arch_timing_value_swap_temp; +#endif /* CONFIG_EXECUTION_BENCHMARKING */ + +/** @} */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/kernel/include/kernel_arch_interface.h b/kernel/include/kernel_arch_interface.h index 16917a3fbc5..0f37093316f 100644 --- a/kernel/include/kernel_arch_interface.h +++ b/kernel/include/kernel_arch_interface.h @@ -212,29 +212,6 @@ static inline bool arch_is_in_isr(void); /** @} */ - -/** - * @defgroup arch-benchmarking Architecture-specific benchmarking globals - * @ingroup arch-interface - * @{ - */ - -#ifdef CONFIG_EXECUTION_BENCHMARKING -extern u64_t arch_timing_swap_start; -extern u64_t arch_timing_swap_end; -extern u64_t arch_timing_irq_start; -extern u64_t arch_timing_irq_end; -extern u64_t arch_timing_tick_start; -extern u64_t arch_timing_tick_end; -extern u64_t arch_timing_user_mode_end; -extern u32_t arch_timing_value_swap_end; -extern u64_t arch_timing_value_swap_common; -extern u64_t arch_timing_value_swap_temp; -#endif /* CONFIG_EXECUTION_BENCHMARKING */ - -/** @} */ - - /** * @defgroup arch-misc Miscellaneous architecture APIs * @ingroup arch-interface