yystopf
/
openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 内核内源代码检视问题修改 

【背景】内源代码检视问题

【修改方案】
1，按检视意见，进行拼写等问题的修改

【影响】
对现有的产品编译不会有影响。

Signed-off-by: wangchen <wangchen64@huawei.com>
This commit is contained in:
wangchen 2022-03-17 11:47:31 +00:00
parent e4cad073a9
commit b06520ac7c
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/base/mem/membox/los_membox.c
View File

@ -93,7 +93,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_MemboxInit(VOID *pool, UINT32 poolSize, UINT32
} }
MEMBOX_LOCK(intSave); MEMBOX_LOCK(intSave);
boxInfo->uwBlkSize = LOS_MEMBOX_ALLIGNED(blkSize + OS_MEMBOX_NODE_HEAD_SIZE); boxInfo->uwBlkSize = LOS_MEMBOX_ALIGNED(blkSize + OS_MEMBOX_NODE_HEAD_SIZE);
boxInfo->uwBlkNum = (poolSize - sizeof(LOS_MEMBOX_INFO)) / boxInfo->uwBlkSize; boxInfo->uwBlkNum = (poolSize - sizeof(LOS_MEMBOX_INFO)) / boxInfo->uwBlkSize;
boxInfo->uwBlkCnt = 0; boxInfo->uwBlkCnt = 0;
if (boxInfo->uwBlkNum == 0) { if (boxInfo->uwBlkNum == 0) {

6
kernel/base/mem/tlsf/los_memory.c
View File

@ -169,7 +169,7 @@ struct OsMemPoolHead {
/* The memory pool support expand. */ /* The memory pool support expand. */
#define OS_MEM_POOL_EXPAND_ENABLE 0x01 #define OS_MEM_POOL_EXPAND_ENABLE 0x01
/* The memory pool ssupport no lock. */ /* The memory pool support no lock. */
#define OS_MEM_POOL_LOCK_ENABLE 0x02 #define OS_MEM_POOL_LOCK_ENABLE 0x02
#define OS_MEM_NODE_MAGIC 0xABCDDCBA #define OS_MEM_NODE_MAGIC 0xABCDDCBA
@ -486,7 +486,7 @@ STATIC INLINE VOID OsLmsAllocAlignMark(VOID *ptr, VOID *alignedPtr, UINT32 size)
g_lms->simpleMark((UINTPTR)ptr + sizeof(UINT32), (UINTPTR)alignedPtr, LMS_SHADOW_REDZONE_U8); g_lms->simpleMark((UINTPTR)ptr + sizeof(UINT32), (UINTPTR)alignedPtr, LMS_SHADOW_REDZONE_U8);
} }
/* mark remining as redzone */ /* mark remaining as redzone */
g_lms->simpleMark(LMS_ADDR_ALIGN((UINTPTR)alignedPtr + size), (UINTPTR)OS_MEM_NEXT_NODE(allocNode), g_lms->simpleMark(LMS_ADDR_ALIGN((UINTPTR)alignedPtr + size), (UINTPTR)OS_MEM_NEXT_NODE(allocNode),
LMS_SHADOW_REDZONE_U8); LMS_SHADOW_REDZONE_U8);
} }
@ -1804,7 +1804,7 @@ STATIC VOID OsMemIntegrityCheckError(struct OsMemPoolHead *pool,
tmpNode, preNode, taskCB->taskName); tmpNode, preNode, taskCB->taskName);
#else #else
MEM_UNLOCK(pool, intSave); MEM_UNLOCK(pool, intSave);
LOS_Panic("Memory interity check error, cur node: %#x, pre node: %#x\n", tmpNode, preNode); LOS_Panic("Memory integrity check error, cur node: %#x, pre node: %#x\n", tmpNode, preNode);
#endif #endif
} }

4
kernel/base/mp/los_lockdep.c
View File

@ -165,7 +165,7 @@ STATIC VOID OsLockDepDumpLock(const LosTaskCB *task, const SPIN_LOCK_S *lock,
} }
} }
STATIC BOOL OsLockDepCheckDependancy(const LosTaskCB *current, LosTaskCB *lockOwner) STATIC BOOL OsLockDepCheckDependency(const LosTaskCB *current, LosTaskCB *lockOwner)
{ {
BOOL checkResult = TRUE; BOOL checkResult = TRUE;
SPIN_LOCK_S *lockTemp = NULL; SPIN_LOCK_S *lockTemp = NULL;
@ -217,7 +217,7 @@ VOID OsLockDepCheckIn(SPIN_LOCK_S *lock)
goto OUT; goto OUT;
} }
if (OsLockDepCheckDependancy(current, lockOwner) != TRUE) { if (OsLockDepCheckDependency(current, lockOwner) != TRUE) {
checkResult = LOCKDEP_ERR_DEAD_LOCK; checkResult = LOCKDEP_ERR_DEAD_LOCK;
goto OUT; goto OUT;
} }

4
kernel/include/los_membox.h
View File

@ -74,14 +74,14 @@ typedef LOS_MEMBOX_INFO OS_MEMBOX_S;
* @ingroup los_membox * @ingroup los_membox
* Memory pool alignment * Memory pool alignment
*/ */
#define LOS_MEMBOX_ALLIGNED(memAddr) (((UINTPTR)(memAddr) + sizeof(UINTPTR) - 1) & (~(sizeof(UINTPTR) - 1))) #define LOS_MEMBOX_ALIGNED(memAddr) (((UINTPTR)(memAddr) + sizeof(UINTPTR) - 1) & (~(sizeof(UINTPTR) - 1)))
/** /**
* @ingroup los_membox * @ingroup los_membox
* Memory pool size * Memory pool size
*/ */
#define LOS_MEMBOX_SIZE(blkSize, blkNum) \ #define LOS_MEMBOX_SIZE(blkSize, blkNum) \
(sizeof(LOS_MEMBOX_INFO) + (LOS_MEMBOX_ALLIGNED((blkSize) + OS_MEMBOX_NODE_HEAD_SIZE) * (blkNum))) (sizeof(LOS_MEMBOX_INFO) + (LOS_MEMBOX_ALIGNED((blkSize) + OS_MEMBOX_NODE_HEAD_SIZE) * (blkNum)))
/** /**
* @ingroup los_membox * @ingroup los_membox