Changeset 494 for Whitix/branches/hybrid

Timestamp:

05/13/08 23:56:11 (4 months ago)

Author:

mwhitworth

Message:

Fix page allocation in mmap.c.

Files:

• Whitix/branches/hybrid/memory/mmap.c (modified) (6 diffs)

Whitix/branches/hybrid/memory/mmap.c

@@ -21 +21 @@
 #include <llist.h>
 #include <malloc.h>
+#include <module.h>
 #include <typedefs.h>
 #include <i386/i386.h>
@@ -60 +61 @@
 }
 
+SYMBOL_EXPORT(VmLookupAddress);
+
 /***********************************************************************
  *
@@ -251 +254 @@
                 }else{
                         newPage=PageAlloc();
+
+                        if (!newPage)
+                                return -ENOMEM;
+
                         VirtMemMapPage(address,newPage->physAddr,area->protection);
 
@@ -268 +275 @@
                         /* So no luck finding it in the VNode's mapping list - read it in */
                         newPage=PageAlloc();
+
+                        if (!newPage)
+                                return -ENOMEM;
+
                         VirtMemMapPage(address,newPage->physAddr,area->protection | PAGE_ACCESSED | PAGE_SHARED);
 
@@ -347 +358 @@
 
         address=PAGE_ALIGN(address);
+
+//      printf("%s: %d: MMapHandleFault(%#X, %d, %d, %d)\n", current->name, current->pid, address, error, VM_WRITE, VM_USER);
 
         /* A null pointer has been deferenced */
@@ -605 +618 @@
 
         if (!(flags & MMAP_FIXED))
-                address=MMapFindAddress(process,length);
+                address=MMapFindAddress(process, length);
 
         if (address < MMAP_BASE)