From f5b024fb5d977908cede61170af959a99fd7cb12 Mon Sep 17 00:00:00 2001 From: Michael Phipps Date: Tue, 21 Jan 2003 02:45:14 +0000 Subject: [PATCH] Slight changes/bug fixes git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2525 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/vm2/areaManager.C | 4 ++-- src/kernel/vm2/vpage.C | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kernel/vm2/areaManager.C b/src/kernel/vm2/areaManager.C index 9fa407c6f8..f883318a4d 100644 --- a/src/kernel/vm2/areaManager.C +++ b/src/kernel/vm2/areaManager.C @@ -30,8 +30,8 @@ unsigned long areaManager::getNextAddress(int pages, unsigned long start) { // error ("Looking for %x, %d pages; current = %x\n",start,pages,myArea->getEndAddress()); if (!myArea->couldAdd(start,end)) { // if we don't work, there must be an overlap, so go to the end of this area. - start=myArea->getEndAddress(); - end=start+(pages*PAGE_SIZE)-1; + start=myArea->getEndAddress()+1; // Since the end address == last byte in the area... + end=start+(pages*PAGE_SIZE)-1; // See above... } } } diff --git a/src/kernel/vm2/vpage.C b/src/kernel/vm2/vpage.C index 394235d908..ff1d34e2ad 100644 --- a/src/kernel/vm2/vpage.C +++ b/src/kernel/vm2/vpage.C @@ -177,7 +177,7 @@ char vpage::getByte(unsigned long address,areaManager *manager) { if (!physPage) if (!manager->fault((void *)(address),false)) throw ("vpage::getByte"); - error ("vpage::getByte: About to return %c from %x\n", *((char *)(address-start_address+physPage->getAddress())),(address-start_address+physPage->getAddress())); +// error ("vpage::getByte: About to return %c from %x\n", *((char *)(address-start_address+physPage->getAddress())),(address-start_address+physPage->getAddress())); return *((char *)(address-start_address+physPage->getAddress())); }