diff -r c734af59ce98 -r 5b5d147c7838 kerneltest/e32test/defrag/t_ramdefrag.cpp --- a/kerneltest/e32test/defrag/t_ramdefrag.cpp Tue May 11 17:28:22 2010 +0300 +++ b/kerneltest/e32test/defrag/t_ramdefrag.cpp Tue May 25 14:09:55 2010 +0300 @@ -1518,7 +1518,7 @@ } else { - if ((allocMov || allocDis) && prevZoneNotFull) + if (verifySpread && (allocMov || allocDis) && prevZoneNotFull) {// The previous least preferable RAM zones were not full so shouldn't // be any movable or discardable pages in the RAM zones of this preference. test.Printf(_L("Movable or discardable pages in more preferable RAM zones unnecessarily\n")); @@ -3053,8 +3053,9 @@ break; } totMov -= gZoneUtilArray[zoneIndexCand].iAllocMovable; - if (gZoneUtilArray[zoneIndexCand].iFreePages != gZoneUtilArray[zoneIndexCand].iPhysPages && - gZoneUtilArray[zoneIndexCand].iFreePages != 0) + if (gZoneUtilArray[zoneIndexCand].iFreePages && + (gZoneUtilArray[zoneIndexCand].iAllocMovable || + gZoneUtilArray[zoneIndexCand].iAllocDiscardable)) { zoneNotEmptyOrFull = ETrue; }