i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel/vm: Add PAGE_ALIGN in size computation in VMCache::Merge().

Browse Source 
The same is already done in SetMinimalCommitment.
This commit is contained in:
Augustin Cavalier
2025-01-25 16:15:42 -05:00
parent bd4d542bec
commit 832cb40da9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/vm/VMAnonymousCache.cpp
+1 -1
View File
@@ -1036,7 +1036,7 @@ VMAnonymousCache::Merge(VMCache* _source)
committed_size += source->committed_size; committed_size += source->committed_size;
source->committed_size = 0; source->committed_size = 0;
off_t actualSize = virtual_end - virtual_base; off_t actualSize = PAGE_ALIGN(virtual_end - virtual_base);
if (committed_size > actualSize) if (committed_size > actualSize)
_Commit(actualSize, VM_PRIORITY_USER); _Commit(actualSize, VM_PRIORITY_USER);
src/system/kernel/vm/VMAnonymousNoSwapCache.cpp
+1 -1
View File
@@ -197,7 +197,7 @@ VMAnonymousNoSwapCache::Merge(VMCache* _source)
committed_size += source->committed_size; committed_size += source->committed_size;
source->committed_size = 0; source->committed_size = 0;
off_t actualSize = virtual_end - virtual_base; off_t actualSize = PAGE_ALIGN(virtual_end - virtual_base);
if (committed_size > actualSize) { if (committed_size > actualSize) {
vm_unreserve_memory(committed_size - actualSize); vm_unreserve_memory(committed_size - actualSize);
committed_size = actualSize; committed_size = actualSize;