diff --git a/kernel/nanokernel/Makefile b/kernel/nanokernel/Makefile index 879de3a13a1..12a05a56fe4 100644 --- a/kernel/nanokernel/Makefile +++ b/kernel/nanokernel/Makefile @@ -11,6 +11,5 @@ obj-y = nano_fiber.o nano_lifo.o \ obj-$(CONFIG_STACK_CANARIES) += compiler_stack_protect.o obj-$(CONFIG_INT_LATENCY_BENCHMARK) += int_latency_bench.o -obj-$(CONFIG_PERFORMANCE_METRICS) += nanometrics.o obj-$(CONFIG_ADVANCED_POWER_MANAGEMENT) += idle.o obj-$(CONFIG_NANO_TIMERS) += nano_timer.o diff --git a/kernel/nanokernel/nano_init.c b/kernel/nanokernel/nano_init.c index 1f06e40cbb2..d90270013a5 100644 --- a/kernel/nanokernel/nano_init.c +++ b/kernel/nanokernel/nano_init.c @@ -63,6 +63,14 @@ const char * const build_timestamp = BUILD_TIMESTAMP; #define PRINT_BOOT_BANNER() printk(BOOT_BANNER " %s\n", build_timestamp) #endif +/* boot time measurement items */ + +#ifdef CONFIG_BOOT_TIME_MEASUREMENT +uint64_t __noinit __start_tsc; /* timestamp when kernel starts */ +uint64_t __noinit __main_tsc; /* timestamp when main() starts */ +uint64_t __noinit __idle_tsc; /* timestamp when CPU goes idle */ +#endif + /* random number generator items */ #if defined(CONFIG_TEST_RANDOM_GENERATOR) || \ defined(CONFIG_CUSTOM_RANDOM_GENERATOR) diff --git a/kernel/nanokernel/nanometrics.c b/kernel/nanokernel/nanometrics.c deleted file mode 100644 index 807bf133e4a..00000000000 --- a/kernel/nanokernel/nanometrics.c +++ /dev/null @@ -1,42 +0,0 @@ -/* nanometrics.c - nanokernel performance metrics */ - -/* - * Copyright (c) 2012-2014 Wind River Systems, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1) Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2) Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3) Neither the name of Wind River Systems nor the names of its contributors - * may be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include - -#ifdef CONFIG_BOOT_TIME_MEASUREMENT -uint64_t __noinit __start_tsc; /* timestamp when kernel starts */ -uint64_t __noinit __main_tsc; /* timestamp when main() starts */ -uint64_t __noinit __idle_tsc; /* timestamp when CPU goes idle */ -#endif -