sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/arm: Fix linker error: undefined reference to `g_intstackalloc'

Browse Source 
when CONFIG_ARCH_INTERRUPTSTACK, CONFIG_SMP and CONFIG_STACK_COLORATION are true
This commit is contained in:
Xiang Xiao 2020-03-23 19:43:23 +08:00 committed by Ouss4
parent 272a1460c5
commit d5905d5963
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/src/common/up_checkstack.c
View File

@ -211,9 +211,15 @@ ssize_t up_check_stack_remain(void)
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
size_t up_check_intstack(void) size_t up_check_intstack(void)
{ {
#ifdef CONFIG_SMP
return do_stackcheck(up_intstack_base(),
(CONFIG_ARCH_INTERRUPTSTACK & ~3),
true);
#else
return do_stackcheck((uintptr_t)&g_intstackalloc, return do_stackcheck((uintptr_t)&g_intstackalloc,
(CONFIG_ARCH_INTERRUPTSTACK & ~3), (CONFIG_ARCH_INTERRUPTSTACK & ~3),
true); true);
#endif
} }
size_t up_check_intstack_remain(void) size_t up_check_intstack_remain(void)

4
arch/arm/src/common/up_initialize.c
View File

@ -75,7 +75,11 @@
#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 3 #if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 3
static inline void up_color_intstack(void) static inline void up_color_intstack(void)
{ {
#ifdef CONFIG_SMP
uint32_t *ptr = (uint32_t *)up_intstack_base();
#else
uint32_t *ptr = (uint32_t *)&g_intstackalloc; uint32_t *ptr = (uint32_t *)&g_intstackalloc;
#endif
ssize_t size; ssize_t size;
for (size = (CONFIG_ARCH_INTERRUPTSTACK & ~3); for (size = (CONFIG_ARCH_INTERRUPTSTACK & ~3);