Changeset c993e45 in mainline for kernel/generic/src/mm/as.c

Timestamp:

2007-02-11T22:48:43Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bea09de6

Parents:

bd1deed

Message:

small cleanup, more work coming

File:

• kernel/generic/src/mm/as.c (modified) (7 diffs)

kernel/generic/src/mm/as.c

@@ -88 +88 @@
  */
 as_operations_t *as_operations = NULL;
-#endif
 
 /**
@@ -94 +93 @@
  */
 static slab_cache_t *as_slab;
+#endif
 
 /**
@@ -116 +116 @@
 static void sh_info_remove_reference(share_info_t *sh_info);
 
+#ifndef __OBJC__
 static int as_constructor(void *obj, int flags)
 {
@@ -135 +136 @@
         return as_destructor_arch(as);
 }
+#endif
 
 /** Initialize address space subsystem. */
@@ -140 +142 @@
 {
         as_arch_init();
-        
+
+#ifndef __OBJC__
         as_slab = slab_cache_create("as_slab", sizeof(as_t), 0,
             as_constructor, as_destructor, SLAB_CACHE_MAGDEFERRED);
+#endif
         
         AS_KERNEL = as_create(FLAG_AS_KERNEL);
@@ -158 +162 @@
         as_t *as;
 
+#ifdef __OBJC__
+        as = [as_t new];
+        link_initialize(&as->inactive_as_with_asid_link);
+        mutex_initialize(&as->lock);    
+        (void) as_constructor_arch(as, flags);
+#else
         as = (as_t *) slab_alloc(as_slab, 0);
+#endif
         (void) as_create_arch(as, 0);
         
@@ -229 +240 @@
 
         interrupts_restore(ipl);
-        
+
+#ifdef __OBJC__
+        [as free];
+#else
         slab_free(as_slab, as);
+#endif
 }