diff -r 2d65c2f76d7b -r 947f0dc9f7a8 kernel/eka/memmodel/epoc/flexible/mmu/mcodepaging.cpp --- a/kernel/eka/memmodel/epoc/flexible/mmu/mcodepaging.cpp Tue Feb 02 01:24:03 2010 +0200 +++ b/kernel/eka/memmodel/epoc/flexible/mmu/mcodepaging.cpp Fri Apr 16 16:24:37 2010 +0300 @@ -239,7 +239,8 @@ { TRACE2(("DCodePagedMemoryManager::ReadPage(0x%08x,0x%08x,0x%08x,?,?)",aMemory,aIndex,aCount)); - __NK_ASSERT_DEBUG(aRequest->CheckUse(aMemory,aIndex,aCount)); + __NK_ASSERT_DEBUG(aRequest->CheckUseContiguous(aMemory,aIndex,aCount)); + __ASSERT_CRITICAL; START_PAGING_BENCHMARK; @@ -256,6 +257,7 @@ TLinAddr linAddr = aRequest->MapPages(aIndex,aCount,aPages); TInt r = KErrNone; + TThreadMessage message; if(!info.iCodeSize) { @@ -292,7 +294,7 @@ device.iReadUnitShift, ReadFunc, (TAny*)info.iCodeLocalDrive, - (TAny*)&aRequest->iMessage); + (TAny*)&message); if(bufferStart<0) { @@ -332,7 +334,7 @@ pagedCodeInfo->AsyncClose(); - END_PAGING_BENCHMARK(EPagingBmReadCodePage); + END_PAGING_BENCHMARK_N(EPagingBmReadCodePage, aCount); return r; }