michaelh/zephyr
1
0
Fork 0
Code Releases Activity

x86: remove CONFIG_NANOKERNEL references

Browse source 
Change-Id: I8c6ca9189dd09133162816675e33332d6e5a34b3
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2016-11-08 10:41:46 -08:00 • committed by Benjamin Walsh
commit ee95dd22a4
2 changed files with 0 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
arch/x86/core/cpuhalt.c
View file

@ -42,10 +42,6 @@
extern uint64_t __idle_tsc; /* timestamp when CPU went idle */ extern uint64_t __idle_tsc; /* timestamp when CPU went idle */
#endif #endif
#if defined(CONFIG_NANOKERNEL) && defined(CONFIG_TICKLESS_IDLE)
extern void _power_save_idle(void);
#endif
/** /**
* *
* @brief Power save idle routine for IA-32 * @brief Power save idle routine for IA-32
@ -65,11 +61,6 @@ void nano_cpu_idle(void)
__idle_tsc = _tsc_read(); __idle_tsc = _tsc_read();
#endif #endif
#if defined(CONFIG_NANOKERNEL) && defined(CONFIG_TICKLESS_IDLE)
__asm__ volatile("cli");
_power_save_idle();
#endif
__asm__ volatile ( __asm__ volatile (
"sti\n\t" "sti\n\t"
"hlt\n\t"); "hlt\n\t");
@ -102,10 +93,6 @@ void nano_cpu_atomic_idle(unsigned int imask)
_int_latency_stop(); _int_latency_stop();
_sys_k_event_logger_enter_sleep(); _sys_k_event_logger_enter_sleep();
#if defined(CONFIG_NANOKERNEL) && defined(CONFIG_TICKLESS_IDLE)
_power_save_idle();
#endif
__asm__ volatile ( __asm__ volatile (
"sti\n\t" "sti\n\t"
/* /*

8
arch/x86/core/intstub.S
View file

@ -45,12 +45,8 @@
GTEXT(_is_next_thread_current) GTEXT(_is_next_thread_current)
#ifdef CONFIG_SYS_POWER_MANAGEMENT #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) GTEXT(_sys_power_save_idle_exit)
#endif #endif
#endif
#ifdef CONFIG_INT_LATENCY_BENCHMARK #ifdef CONFIG_INT_LATENCY_BENCHMARK
@ -429,9 +425,6 @@ nestedInterrupt:
handle_idle: handle_idle:
pushl %eax pushl %eax
pushl %edx 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 */ /* Populate 'ticks' argument to _sys_power_save_idle_exit */
#ifdef CONFIG_X86_IAMCU #ifdef CONFIG_X86_IAMCU
movl __tNANO_idle_OFFSET(%ecx), %eax movl __tNANO_idle_OFFSET(%ecx), %eax
@ -454,7 +447,6 @@ handle_idle:
/* SYS V: discard 'ticks' argument passed on the stack */ /* SYS V: discard 'ticks' argument passed on the stack */
add $0x4, %esp add $0x4, %esp
#endif #endif
#endif /* CONFIG_NANOKERNEL && CONFIG_TICKLESS_IDLE */
popl %edx popl %edx
popl %eax popl %eax
jmp alreadyOnIntStack jmp alreadyOnIntStack