From 128c3dffb5cb8a8c714d83d0ab8e3f1c7ec05ce5 Mon Sep 17 00:00:00 2001
From: fangye <fangye@talkweb.com.cn>
Date: Fri, 10 Jun 2022 15:39:19 +0800
Subject: [PATCH] =?UTF-8?q?TCB=E7=BB=93=E6=9E=84=E4=BD=93=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=E5=AE=8F=E6=B7=BB=E5=8A=A0=E5=88=86=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: fangye <fangye@talkweb.com.cn>
Change-Id: Ic31310a1da1842adb1b19a0afb1448aa0f4720ef
---
 components/iar_tls/los_iar_tls.h | 2 +-
 kernel/include/los_config.h      | 4 +---
 kernel/include/los_task.h        | 4 +++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/iar_tls/los_iar_tls.h b/components/iar_tls/los_iar_tls.h
index 07d287d6..89873fd1 100644
--- a/components/iar_tls/los_iar_tls.h
+++ b/components/iar_tls/los_iar_tls.h
@@ -32,7 +32,7 @@
 #include "los_compiler.h"
 
 /* Using task extended field to realize IAR TLS function in target_config.h include this header file. */
-#define LOSCFG_TASK_STRUCT_EXTENSION    VOID *iarTlsArea;
+#define LOSCFG_TASK_STRUCT_EXTENSION    VOID *iarTlsArea
 
 #if (__VER__ < 8000000)
 #include <yvals.h>
diff --git a/kernel/include/los_config.h b/kernel/include/los_config.h
index 9b4c01a3..53baffd6 100644
--- a/kernel/include/los_config.h
+++ b/kernel/include/los_config.h
@@ -638,10 +638,8 @@ extern UINT8 *m_aucSysMem0;
 /**
  * @ingroup los_config
  * Task extension field additional functions, such as IAR TLS.
+ * Please Use the LOSCFG_TASK_STRUCT_EXTENSION macro to define your task extended fields in target_config.h
  */
-#ifndef LOSCFG_TASK_STRUCT_EXTENSION
-#define LOSCFG_TASK_STRUCT_EXTENSION
-#endif
 #ifndef LOSCFG_TASK_CREATE_EXTENSION_HOOK
 #define LOSCFG_TASK_CREATE_EXTENSION_HOOK(taskCB)
 #endif
diff --git a/kernel/include/los_task.h b/kernel/include/los_task.h
index ce8441df..1560a27e 100644
--- a/kernel/include/los_task.h
+++ b/kernel/include/los_task.h
@@ -1500,7 +1500,9 @@ typedef struct {
 #if (LOSCFG_KERNEL_SIGNAL == 1)
     VOID                        *sig;                     /**< Task signal */
 #endif
-    LOSCFG_TASK_STRUCT_EXTENSION                          /**< Task extension field */
+#ifdef LOSCFG_TASK_STRUCT_EXTENSION
+    LOSCFG_TASK_STRUCT_EXTENSION;                         /**< Task extension field */
+#endif
 } LosTaskCB;
 
 STATIC INLINE BOOL OsTaskIsExit(const LosTaskCB *taskCB)