diff -r c734af59ce98 -r 5b5d147c7838 kernel/eka/include/memmodel/epoc/mmubase/ramalloc.h --- a/kernel/eka/include/memmodel/epoc/mmubase/ramalloc.h Tue May 11 17:28:22 2010 +0300 +++ b/kernel/eka/include/memmodel/epoc/mmubase/ramalloc.h Tue May 25 14:09:55 2010 +0300 @@ -144,10 +144,11 @@ TInt ZoneAllocRamPages(TUint* aZoneIdList, TUint aZoneIdCount, TPhysAddr* aPageList, TInt aNumPages, TZonePageType aType); TInt AllocContiguousRam(TUint aNumPages, TPhysAddr& aPhysAddr, TInt aAlign=0); #if !defined(__MEMMODEL_MULTIPLE__) && !defined(__MEMMODEL_MOVING__) - void BlockContiguousRegion(TPhysAddr aAddrBase, TUint aNumPages); + TUint BlockContiguousRegion(TPhysAddr aAddrBase, TUint aNumPages); void UnblockSetAllocRuns(TUint& aOffset1, TUint& aOffset2, TUint aRunLength1, TUint aRunLength2, TUint& aAllocLength, TUint& aAllocStart); void UnblockContiguousRegion(TPhysAddr aAddrBase, TUint aNumPages); - TBool ClearContiguousRegion(TPhysAddr aAddrBase, TPhysAddr aZoneBase, TUint aNumPages, TInt& aOffset); + TBool ClearContiguousRegion(TPhysAddr aAddrBase, TPhysAddr aZoneBase, TUint aNumPages, TInt& aOffsetm, TUint aUnreservedPages); + TUint CountPagesInRun(TPhysAddr aAddrBase, TPhysAddr aAddrEndPage, TZonePageType aType); #endif TInt ZoneAllocContiguousRam(TUint* aZoneIdList, TUint aZoneIdCount, TInt aSize, TPhysAddr& aPhysAddr, TInt aAlign); #ifdef _DEBUG