kernel/vm: Add PAGE_ALIGN in size computation in VMCache::Merge().
The same is already done in SetMinimalCommitment.
This commit is contained in:
@@ -1036,7 +1036,7 @@ VMAnonymousCache::Merge(VMCache* _source)
|
||||
committed_size += source->committed_size;
|
||||
source->committed_size = 0;
|
||||
|
||||
off_t actualSize = virtual_end - virtual_base;
|
||||
off_t actualSize = PAGE_ALIGN(virtual_end - virtual_base);
|
||||
if (committed_size > actualSize)
|
||||
_Commit(actualSize, VM_PRIORITY_USER);
|
||||
|
||||
|
||||
@@ -197,7 +197,7 @@ VMAnonymousNoSwapCache::Merge(VMCache* _source)
|
||||
committed_size += source->committed_size;
|
||||
source->committed_size = 0;
|
||||
|
||||
off_t actualSize = virtual_end - virtual_base;
|
||||
off_t actualSize = PAGE_ALIGN(virtual_end - virtual_base);
|
||||
if (committed_size > actualSize) {
|
||||
vm_unreserve_memory(committed_size - actualSize);
|
||||
committed_size = actualSize;
|
||||
|
||||
Reference in New Issue
Block a user