[haiku-commits] haiku: hrev44781 - src/system/kernel/vm
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 6 Nov 2012 20:00:20 +0100 (CET)
hrev44781 adds 1 changeset to branch 'master'
old head: 7bcbf187d0197d78ce4b2b15f2747f8ae1d6093a
new head: 8ddec5b565ddd1ed108a39425f42df348b215c75
----------------------------------------------------------------------------
8ddec5b: vm_page_allocate_page_run: fix previous commit
* remove superfluous codes
* when aligning, sPhysicalPageOffset would be substracted twice
+alpha4
Signed-off-by: Ingo Weinhold <ingo_weinhold at gmx dot de>
[ Jerome Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev44781
Commit: 8ddec5b565ddd1ed108a39425f42df348b215c75
URL: http://cgit.haiku-os.org/haiku/commit/?id=8ddec5b
Author: Jerome Duval <jerome.duval@xxxxxxxxx>
Date: Tue Nov 6 18:40:47 2012 UTC
----------------------------------------------------------------------------
1 file changed, 3 insertions(+), 4 deletions(-)
src/system/kernel/vm/vm_page.cpp | 7 +++----
----------------------------------------------------------------------------
diff --git a/src/system/kernel/vm/vm_page.cpp b/src/system/kernel/vm/vm_page.cpp
index 29df4e1..007aacd 100644
--- a/src/system/kernel/vm/vm_page.cpp
+++ b/src/system/kernel/vm/vm_page.cpp
@@ -3862,9 +3862,8 @@ vm_page_allocate_page_run(uint32 flags, page_num_t length,
page_num_t offsetStart = start + sPhysicalPageOffset;
// enforce alignment
- if (alignmentMask != 0 && (offsetStart & alignmentMask)
!= 0) {
- offsetStart = ((offsetStart + alignmentMask) &
~alignmentMask)
- - sPhysicalPageOffset;
+ if ((offsetStart & alignmentMask) != 0) {
+ offsetStart = (offsetStart + alignmentMask) &
~alignmentMask;
}
// enforce boundary
@@ -3919,7 +3918,7 @@ vm_page_allocate_page_run(uint32 flags, page_num_t length,
freeClearQueueLocker.Lock();
}
- start += max_c(i, alignmentMask) + 1;
+ start += i + 1;
}
}
Other related posts:
- » [haiku-commits] haiku: hrev44781 - src/system/kernel/vm - korli
