From ee95dd22a46c89cb8e52cd3fef243516a8f13faf Mon Sep 17 00:00:00 2001 From: Andrew Boie Date: Tue, 8 Nov 2016 10:41:46 -0800 Subject: [PATCH] x86: remove CONFIG_NANOKERNEL references Change-Id: I8c6ca9189dd09133162816675e33332d6e5a34b3 Signed-off-by: Andrew Boie --- arch/x86/core/cpuhalt.c | 13 ------------- arch/x86/core/intstub.S | 8 -------- 2 files changed, 21 deletions(-) diff --git a/arch/x86/core/cpuhalt.c b/arch/x86/core/cpuhalt.c index 1a27fee9d60..b1db4e4c1f7 100644 --- a/arch/x86/core/cpuhalt.c +++ b/arch/x86/core/cpuhalt.c @@ -42,10 +42,6 @@ extern uint64_t __idle_tsc; /* timestamp when CPU went idle */ #endif -#if defined(CONFIG_NANOKERNEL) && defined(CONFIG_TICKLESS_IDLE) -extern void _power_save_idle(void); -#endif - /** * * @brief Power save idle routine for IA-32 @@ -65,11 +61,6 @@ void nano_cpu_idle(void) __idle_tsc = _tsc_read(); #endif -#if defined(CONFIG_NANOKERNEL) && defined(CONFIG_TICKLESS_IDLE) - __asm__ volatile("cli"); - _power_save_idle(); -#endif - __asm__ volatile ( "sti\n\t" "hlt\n\t"); @@ -102,10 +93,6 @@ void nano_cpu_atomic_idle(unsigned int imask) _int_latency_stop(); _sys_k_event_logger_enter_sleep(); -#if defined(CONFIG_NANOKERNEL) && defined(CONFIG_TICKLESS_IDLE) - _power_save_idle(); -#endif - __asm__ volatile ( "sti\n\t" /* diff --git a/arch/x86/core/intstub.S b/arch/x86/core/intstub.S index aadb34df739..fc63b340940 100644 --- a/arch/x86/core/intstub.S +++ b/arch/x86/core/intstub.S @@ -45,12 +45,8 @@ GTEXT(_is_next_thread_current) #ifdef CONFIG_SYS_POWER_MANAGEMENT -#if defined(CONFIG_NANOKERNEL) && defined(CONFIG_TICKLESS_IDLE) - GTEXT(_power_save_idle_exit) -#else GTEXT(_sys_power_save_idle_exit) #endif -#endif #ifdef CONFIG_INT_LATENCY_BENCHMARK @@ -429,9 +425,6 @@ nestedInterrupt: handle_idle: pushl %eax pushl %edx -#if defined(CONFIG_NANOKERNEL) && defined(CONFIG_TICKLESS_IDLE) - call _power_save_idle_exit -#else /* Populate 'ticks' argument to _sys_power_save_idle_exit */ #ifdef CONFIG_X86_IAMCU movl __tNANO_idle_OFFSET(%ecx), %eax @@ -454,7 +447,6 @@ handle_idle: /* SYS V: discard 'ticks' argument passed on the stack */ add $0x4, %esp #endif -#endif /* CONFIG_NANOKERNEL && CONFIG_TICKLESS_IDLE */ popl %edx popl %eax jmp alreadyOnIntStack