Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-19 19:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move mismerged segment to the right place; claim from openfirmware if we

Browse source 
don't have enough reserve.

svn path=/trunk/; revision=28801
This commit is contained in:
Art Yerkes 2007-09-03 05:29:03 +00:00
parent 12b88bedcb
commit 930b718aa7
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/boot/freeldr/freeldr/mm/mm.c
View file

@ -68,12 +68,6 @@ PVOID MmAllocateMemory(ULONG MemorySize)
if (MemorySize == 0)
{
#ifdef _M_PPC
ULONG ptr;
printf("Allocating %d bytes directly ...\n", MemorySize);
ptr = ofw_claim(0,MemorySize,MM_PAGE_SIZE);
MemPointer = (PVOID)(ptr);
#endif
DbgPrint((DPRINT_MEMORY, "MmAllocateMemory() called for 0 bytes. Returning NULL.\n"));
UiMessageBoxCritical("Memory allocation failed: MmAllocateMemory() called for 0 bytes.");
return NULL;
@ -95,9 +89,17 @@ PVOID MmAllocateMemory(ULONG MemorySize)
// then return NULL
if (FreePagesInLookupTable < PagesNeeded)
{
#ifdef _M_PPC
ULONG ptr;
printf("Allocating %d bytes directly ...\n", MemorySize);
ptr = ofw_claim(0,MemorySize,MM_PAGE_SIZE);
MemPointer = (PVOID)(ptr);
return MemPointer;
#else
DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemory(). Not enough free memory to allocate %d bytes. AllocationCount: %d\n", MemorySize, AllocationCount));
UiMessageBoxCritical("Memory allocation failed: out of memory.");
return NULL;
#endif
}
FirstFreePageFromEnd = MmFindAvailablePages(PageLookupTableAddress, TotalPagesInLookupTable, PagesNeeded, AllocateFromEnd);