diff --git a/arch/arm/arm/include/los_arch_mmu.h b/arch/arm/arm/include/los_arch_mmu.h index 93b2fd34495fbd9fbe00134f3467aa07d5ce65d0..61a0a21505e80c7e4eaed71718209f027990768c 100644 --- a/arch/arm/arm/include/los_arch_mmu.h +++ b/arch/arm/arm/include/los_arch_mmu.h @@ -71,5 +71,5 @@ VADDR_T *OsGFirstTableGet(VOID); #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* __LOS_VM_PAGE_H__ */ +#endif /* __LOS_ARCH_MMU_H__ */ diff --git a/arch/arm/arm/src/los_arch_mmu.c b/arch/arm/arm/src/los_arch_mmu.c index b3991ce27b58699cd2a481d86e2119d29369a037..0e7647fe0c278c098b19b8b732acf03a2d3368bf 100644 --- a/arch/arm/arm/src/los_arch_mmu.c +++ b/arch/arm/arm/src/los_arch_mmu.c @@ -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; } diff --git a/kernel/base/vm/los_vm_dump.c b/kernel/base/vm/los_vm_dump.c index 83ef92b4331bc856897d185faae635ca2c8ea9fc..f25ee21cb2436b952c2ab5190b6b749599519139 100644 --- a/kernel/base/vm/los_vm_dump.c +++ b/kernel/base/vm/los_vm_dump.c @@ -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", diff --git a/kernel/base/vm/los_vm_fault.c b/kernel/base/vm/los_vm_fault.c index ead6eff00b23ddac9abd47413af12a9a0c4ef411..d6d9ab64c8925616d04dc84eddc3d1e3fe1ab643 100644 --- a/kernel/base/vm/los_vm_fault.c +++ b/kernel/base/vm/los_vm_fault.c @@ -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; diff --git a/kernel/base/vm/los_vm_scan.c b/kernel/base/vm/los_vm_scan.c index e179f8fe30c896771ab3f4d38a0756b95a7bbfbf..0975baaaff07385d9f0aebc1d34a03267a998eb6 100644 --- a/kernel/base/vm/los_vm_scan.c +++ b/kernel/base/vm/los_vm_scan.c @@ -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 diff --git a/kernel/include/los_membox.h b/kernel/include/los_membox.h index 55c9989b468bf0a4e263f6a3b59f30f98b745d4e..9d58cdd5cecc225cd2dac1fcf2598f48999ed98a 100644 --- a/kernel/include/los_membox.h +++ b/kernel/include/los_membox.h @@ -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. diff --git a/kernel/include/los_memory.h b/kernel/include/los_memory.h index 8dd00599c69f834dfea82de85bef2e81e6f5b4a5..e236e44b29796fee979924529668a9f1f1ee7e53 100644 --- a/kernel/include/los_memory.h +++ b/kernel/include/los_memory.h @@ -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