michaelh/zephyr
1
0
Fork 0
Code Releases Activity

x86: core: thread: Avoid clash with function identifier

Browse source 
There is a function called _thread_entry defined in
lib/thread_entry.c. Just changing name to fix MISRA-C violation.

MISRA-C rule 5.8

Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
This commit is contained in:
Flavio Ceolin 2018-11-15 15:59:24 -08:00 • committed by Anas Nashif
commit 1492df3415
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
arch/x86/core/thread.c
View file

@ -34,7 +34,7 @@ struct _x86_initial_frame {
u32_t ebx; u32_t ebx;
u32_t esi; u32_t esi;
u32_t edi; u32_t edi;
void *_thread_entry; void *thread_entry;
u32_t eflags; u32_t eflags;
k_thread_entry_t entry; k_thread_entry_t entry;
void *p1; void *p1;
@ -102,18 +102,18 @@ void _new_thread(struct k_thread *thread, k_thread_stack_t *stack,
if (options & K_USER) { if (options & K_USER) {
#ifdef _THREAD_WRAPPER_REQUIRED #ifdef _THREAD_WRAPPER_REQUIRED
initial_frame->edi = (u32_t)_arch_user_mode_enter; initial_frame->edi = (u32_t)_arch_user_mode_enter;
initial_frame->_thread_entry = _x86_thread_entry_wrapper; initial_frame->thread_entry = _x86_thread_entry_wrapper;
#else #else
initial_frame->_thread_entry = _arch_user_mode_enter; initial_frame->thread_entry = _arch_user_mode_enter;
#endif /* _THREAD_WRAPPER_REQUIRED */ #endif /* _THREAD_WRAPPER_REQUIRED */
} else } else
#endif /* CONFIG_X86_USERSPACE */ #endif /* CONFIG_X86_USERSPACE */
{ {
#ifdef _THREAD_WRAPPER_REQUIRED #ifdef _THREAD_WRAPPER_REQUIRED
initial_frame->edi = (u32_t)_thread_entry; initial_frame->edi = (u32_t)_thread_entry;
initial_frame->_thread_entry = _x86_thread_entry_wrapper; initial_frame->thread_entry = _x86_thread_entry_wrapper;
#else #else
initial_frame->_thread_entry = _thread_entry; initial_frame->thread_entry = _thread_entry;
#endif #endif
} }
/* Remaining _x86_initial_frame members can be garbage, _thread_entry() /* Remaining _x86_initial_frame members can be garbage, _thread_entry()