diff --git a/arch/x86/core/cpuhalt.s b/arch/x86/core/cpuhalt.s index 9ea3c0f746d..ee36f58ce80 100644 --- a/arch/x86/core/cpuhalt.s +++ b/arch/x86/core/cpuhalt.s @@ -145,7 +145,7 @@ SECTION_FUNC(TEXT, nano_cpu_atomic_idle) testl $0x200, SP_ARG1(%esp) jnz skipIntDisable #ifdef CONFIG_INT_LATENCY_BENCHMARK - call _IntLatencyStart + call _int_latency_start #endif cli BRANCH_LABEL(skipIntDisable) diff --git a/arch/x86/core/intstub.s b/arch/x86/core/intstub.s index 60c110b31c8..1b94d43791a 100644 --- a/arch/x86/core/intstub.s +++ b/arch/x86/core/intstub.s @@ -71,7 +71,7 @@ entering and exiting a C interrupt handler. #ifdef CONFIG_INT_LATENCY_BENCHMARK - GTEXT(_IntLatencyStart) + GTEXT(_int_latency_start) GTEXT(_IntLatencyStop) #endif /******************************************************************************* @@ -171,7 +171,7 @@ SECTION_FUNC(TEXT, _IntEnt) */ pushl %eax - call _IntLatencyStart + call _int_latency_start popl %eax #endif @@ -268,7 +268,7 @@ SECTION_FUNC(TEXT, _IntExit) cli /* disable interrupts */ #ifdef CONFIG_INT_LATENCY_BENCHMARK - call _IntLatencyStart + call _int_latency_start #endif /* determine whether exiting from a nested interrupt */ @@ -495,7 +495,7 @@ SECTION_FUNC(TEXT, irq_lock) pushfl cli #ifdef CONFIG_INT_LATENCY_BENCHMARK - call _IntLatencyStart + call _int_latency_start #endif popl %eax ret diff --git a/include/nanokernel/x86/arch.h b/include/nanokernel/x86/arch.h index 271bf1a01d1..771b3630fb7 100644 --- a/include/nanokernel/x86/arch.h +++ b/include/nanokernel/x86/arch.h @@ -259,7 +259,7 @@ static inline void irq_unlock(unsigned int key) {} #else /* CONFIG_NO_ISRS */ #ifdef CONFIG_INT_LATENCY_BENCHMARK -void _IntLatencyStart (void); +void _int_latency_start (void); void _IntLatencyStop (void); #endif @@ -313,7 +313,7 @@ static inline __attribute__((always_inline)) ); #ifdef CONFIG_INT_LATENCY_BENCHMARK - _IntLatencyStart (); + _int_latency_start (); #endif return key; @@ -330,7 +330,7 @@ __asm volatile unsigned int irq_lock_inline (void) pushfl cli #ifdef CONFIG_INT_LATENCY_BENCHMARK - call _IntLatencyStart + call _int_latency_start #endif popl %eax } diff --git a/kernel/nanokernel/core/int_latency_bench.c b/kernel/nanokernel/core/int_latency_bench.c index e66fe100975..c077d56cfff 100644 --- a/kernel/nanokernel/core/int_latency_bench.c +++ b/kernel/nanokernel/core/int_latency_bench.c @@ -86,7 +86,7 @@ uint32_t _HwIntToCHandlerLatency = ULONG_MAX; * */ -void _IntLatencyStart(void) +void _int_latency_start(void) { /* when interrupts are not already locked, take time stamp */ if (!intLockedTimestamp && intLatencyBenchRdy) { @@ -180,12 +180,12 @@ void intLatencyInit(void) /* measure time to call intLatencyStart() and intLatencyStop * takes */ initialStartDelay = timer_read(); - _IntLatencyStart(); + _int_latency_start(); initialStartDelay = timer_read() - initialStartDelay - timeToReadTime; nestingDelay = timer_read(); - _IntLatencyStart(); + _int_latency_start(); nestingDelay = timer_read() - nestingDelay - timeToReadTime; stopDelay = timer_read();