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

Pre Merge pull request !1112 from AsterNighT/typo/mm

This commit is contained in:
AsterNighT 2024-04-23 04:17:47 +00:00 committed by Gitee
parent e539a6c951 3dca752773
commit a69e6e9461
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/src/mm/los_memory.c
View File

@ -1311,14 +1311,14 @@ STATIC INLINE UINT32 OsMemFree(struct OsMemPoolHead *pool, struct OsMemNodeHead
g_lms->check((UINTPTR)node + OS_MEM_NODE_HEAD_SIZE, TRUE); g_lms->check((UINTPTR)node + OS_MEM_NODE_HEAD_SIZE, TRUE);
} }
#endif #endif
struct OsMemNodeHead *preNode = node->ptr.prev; /* merage preNode */ struct OsMemNodeHead *preNode = node->ptr.prev; /* merge preNode */
if ((preNode != NULL) && !OS_MEM_NODE_GET_USED_FLAG(preNode->sizeAndFlag)) { if ((preNode != NULL) && !OS_MEM_NODE_GET_USED_FLAG(preNode->sizeAndFlag)) {
OsMemFreeNodeDelete(pool, (struct OsMemFreeNodeHead *)preNode); OsMemFreeNodeDelete(pool, (struct OsMemFreeNodeHead *)preNode);
OsMemMergeNode(node); OsMemMergeNode(node);
node = preNode; node = preNode;
} }
struct OsMemNodeHead *nextNode = OS_MEM_NEXT_NODE(node); /* merage nextNode */ struct OsMemNodeHead *nextNode = OS_MEM_NEXT_NODE(node); /* merge nextNode */
if ((nextNode != NULL) && !OS_MEM_NODE_GET_USED_FLAG(nextNode->sizeAndFlag)) { if ((nextNode != NULL) && !OS_MEM_NODE_GET_USED_FLAG(nextNode->sizeAndFlag)) {
OsMemFreeNodeDelete(pool, (struct OsMemFreeNodeHead *)nextNode); OsMemFreeNodeDelete(pool, (struct OsMemFreeNodeHead *)nextNode);
OsMemMergeNode(nextNode); OsMemMergeNode(nextNode);