p71924506
/
kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!692 chore: 修复内存模块的一些不规范用语 

Merge pull request !692 from kenneth/mmu_fix
This commit is contained in:
openharmony_ci 2021-11-10 02:06:29 +00:00 committed by Gitee
parent e317f9b5b5 466996b2e1
commit f63ce99399
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/arm/include/los_arch_mmu.h
View File

@ -71,5 +71,5 @@ VADDR_T *OsGFirstTableGet(VOID);
#endif /* __cplusplus */
#endif /* __cplusplus */
#endif /* __LOS_VM_PAGE_H__ */
#endif /* __LOS_ARCH_MMU_H__ */

8
arch/arm/arm/src/los_arch_mmu.c
View File

@ -618,7 +618,7 @@ STATIC UINT32 OsCvtPte2FlagsToAttrs(UINT32 flags)
return mmuFlags;
}
STATIC UINT32 OsMapL2PageContinous(PTE_T pte1, UINT32 flags, VADDR_T *vaddr, PADDR_T *paddr, UINT32 *count)
STATIC UINT32 OsMapL2PageContinuous(PTE_T pte1, UINT32 flags, VADDR_T *vaddr, PADDR_T *paddr, UINT32 *count)
{
PTE_T *pte2BasePtr = NULL;
UINT32 archFlags;
@ -662,9 +662,9 @@ status_t LOS_ArchMmuMap(LosArchMmu *archMmu, VADDR_T vaddr, PADDR_T paddr, size_
l1Entry = OsGetPte1(archMmu->virtTtb, vaddr);
if (OsIsPte1Invalid(l1Entry)) {
OsMapL1PTE(archMmu, &l1Entry, vaddr, flags);
saveCounts = OsMapL2PageContinous(l1Entry, flags, &vaddr, &paddr, &count);
saveCounts = OsMapL2PageContinuous(l1Entry, flags, &vaddr, &paddr, &count);
} else if (OsIsPte1PageTable(l1Entry)) {
saveCounts = OsMapL2PageContinous(l1Entry, flags, &vaddr, &paddr, &count);
saveCounts = OsMapL2PageContinuous(l1Entry, flags, &vaddr, &paddr, &count);
} else {
LOS_Panic("%s %d, unimplemented tt_entry %x\n", __FUNCTION__, __LINE__, l1Entry);
}
@ -716,7 +716,7 @@ STATUS_T LOS_ArchMmuMove(LosArchMmu *archMmu, VADDR_T oldVaddr, VADDR_T newVaddr
PADDR_T paddr = 0;
if ((archMmu == NULL) || (oldVaddr == 0) || (newVaddr == 0) || (count == 0)) {
VM_ERR("invalid args: archMmu %p, oldVaddr %p, newVddr %p, count %d",
VM_ERR("invalid args: archMmu %p, oldVaddr %p, newVaddr %p, count %d",
archMmu, oldVaddr, newVaddr, count);
return LOS_NOK;
}

4
kernel/base/vm/los_vm_dump.c
View File

@ -97,7 +97,7 @@ INT32 OsRegionOverlapCheckUnlock(LosVmSpace *space, LosVmMapRegion *region)
if (((region->range.base + region->range.size) > regionTemp->range.base) &&
(region->range.base < (regionTemp->range.base + regionTemp->range.size))) {
VM_ERR("overlap between regions:\n"
"flals:%#x base:%p size:%08x space:%p\n"
"flags:%#x base:%p size:%08x space:%p\n"
"flags:%#x base:%p size:%08x space:%p",
region->regionFlags, region->range.base, region->range.size, region->space,
regionTemp->regionFlags, regionTemp->range.base, regionTemp->range.size, regionTemp->space);
@ -521,7 +521,7 @@ VOID OsVmPhysDump(VOID)
PRINTK("active anon %d\n", seg->lruSize[VM_LRU_ACTIVE_ANON]);
PRINTK("inactive anon %d\n", seg->lruSize[VM_LRU_INACTIVE_ANON]);
PRINTK("active file %d\n", seg->lruSize[VM_LRU_ACTIVE_FILE]);
PRINTK("inactice file %d\n", seg->lruSize[VM_LRU_INACTIVE_FILE]);
PRINTK("inactive file %d\n", seg->lruSize[VM_LRU_INACTIVE_FILE]);
}
}
PRINTK("\n\rpmm pages: total = %u, used = %u, free = %u\n",

2
kernel/base/vm/los_vm_fault.c
View File

@ -140,7 +140,7 @@ STATIC STATUS_T OsDoReadFault(LosVmMapRegion *region, LosVmPgFault *vmPgFault)
return LOS_ERRNO_VM_NO_MEMORY;
}
/* numap a page when cow happend only */
/* unmap a page when cow happend only */
STATIC LosVmPage *OsCowUnmapOrg(LosArchMmu *archMmu, LosVmMapRegion *region, LosVmPgFault *vmf)
{
UINT32 intSave;

4
kernel/base/vm/los_vm_scan.c
View File

@ -77,7 +77,7 @@ VOID OsLruCacheAdd(LosFilePage *fpage, enum OsLruList lruType)
LOS_SpinUnlockRestore(&physSeg->lruLock, intSave);
}
/* dellete a lru node, caller need hold lru_lock */
/* delete a lru node, caller need hold lru_lock */
VOID OsLruCacheDel(LosFilePage *fpage)
{
LosVmPhysSeg *physSeg = fpage->physSeg;
@ -175,7 +175,7 @@ VOID OsPageRefIncLocked(LosFilePage *fpage)
LOS_SpinUnlockRestore(&fpage->physSeg->lruLock, intSave);
}
/* page referced dec: (call by thrinker)
/* page referced dec: (call by shrinker)
----------inactive----------|----------active------------
[ref:0,act:0], [ref:1,act:0]|[ref:0,act:1], [ref:1,act:1]
ref:1, act:1 --> ref:0, act:1

2
kernel/include/los_membox.h
View File

@ -230,7 +230,7 @@ extern VOID LOS_ShowBox(VOID *pool);
*
* @param boxMem [IN] Type #VOID* Pointer to the calculate membox.
* @param maxBlk [OUT] Type #UINT32* Record membox max block.
* @param blkCnt [OUT] Type #UINT32* Record membox block count alreay allocated.
* @param blkCnt [OUT] Type #UINT32* Record membox block count already allocated.
* @param blkSize [OUT] Type #UINT32* Record membox block size.
*
* @retval #LOS_OK The heap status calculate success.

2
kernel/include/los_memory.h
View File

@ -59,7 +59,7 @@ extern "C" {
/**
* @ingroup los_memory
* The recored layes of function call.
* The recored layers of function call.
*/
#define LOS_RECORD_LR_CNT 3
#endif