Changeset 895 for Whitix/trunk/arch/i386/mm/virt.c

Timestamp:

09/23/08 14:30:48 (4 months ago)

Author:

mwhitworth

Message:

Call SlabInit in VirtInit, add locking, remove imports.h

Files:

• Whitix/trunk/arch/i386/mm/virt.c (modified) (7 diffs)

Whitix/trunk/arch/i386/mm/virt.c

@@ -10 +10 @@
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Whitix; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
@@ -27 +23 @@
 #include <malloc.h>
 #include <slab.h>
-#include <imports.h>
 #include <print.h>
 
@@ -66 +61 @@
 int VirtMemManagerSetup(struct Process* process)
 {
-        process->memManager=(struct MemManager*)memCacheAlloc(managerCache);
+        process->memManager=(struct MemManager*)MemCacheAlloc(managerCache);
         if (!process->memManager)
                 return -EFAULT;
@@ -172 +167 @@
         }
 
-        ListAdd(&manager->list,&managerList);
+        if (currThread)
+                PreemptDisable();
+
+        ListAddTail(&manager->list,&managerList);
+
+        if (currThread)
+                PreemptEnable();
 
         IrqRestoreFlags(flags);
@@ -211 +212 @@
          * one for safety, as this one will be freed. */
 
+        PreemptDisable();
+
         if (manager == current->memManager)
                 VirtSetCurrent(&kernelMem);
@@ -227 +230 @@
         VirtUnmapPhysPage((DWORD)vPageDir);
         ListRemove(&manager->list);
-        memCacheFree(managerCache,manager);
+
+        PreemptEnable();
+
+        MemCacheFree(managerCache,manager);
 
         return 0;
@@ -242 +248 @@
 int VirtInit()
 {
-        managerCache=memCacheCreate("Manager Cache",sizeof(struct MemManager),NULL,NULL,0);
+        managerCache=MemCacheCreate("Manager Cache",sizeof(struct MemManager),NULL,NULL,0);
         if (!managerCache)
                 return -ENOMEM;
+        
+        extern int SlabInit();  
+        SlabInit();
 
         return 0;