Merge branch 'bugfix/allow_external_stack' into 'master'

freertos: fix a bug for incorrect check of allow-external-stack

See merge request !1596
pull/1206/merge
Ivan Grokhotkov 2017-11-27 16:31:27 +08:00
commit 9e530fd063
1 zmienionych plików z 1 dodań i 1 usunięć

Wyświetl plik

@ -264,7 +264,7 @@ static inline unsigned portENTER_CRITICAL_NESTED() {
//xTaskCreateStatic uses these functions to check incoming memory. //xTaskCreateStatic uses these functions to check incoming memory.
#define portVALID_TCB_MEM(ptr) (esp_ptr_internal(ptr) && esp_ptr_byte_accessible(ptr)) #define portVALID_TCB_MEM(ptr) (esp_ptr_internal(ptr) && esp_ptr_byte_accessible(ptr))
#ifndef CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY #ifdef CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY
#define portVALID_STACK_MEM(ptr) esp_ptr_byte_accessible(ptr) #define portVALID_STACK_MEM(ptr) esp_ptr_byte_accessible(ptr)
#else #else
#define portVALID_STACK_MEM(ptr) (esp_ptr_internal(ptr) && esp_ptr_byte_accessible(ptr)) #define portVALID_STACK_MEM(ptr) (esp_ptr_internal(ptr) && esp_ptr_byte_accessible(ptr))