Changeset ba2be23 in mainline

Timestamp:

2013-09-09T23:34:09Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

285589b

Parents:

e2a0d76

Message:

remove the ugly code
(ASAP is now)

Location:

kernel/generic

Files:

• include/mm/as.h (modified) (1 diff)
• src/ddi/ddi.c (modified) (1 diff)
• src/mm/as.c (modified) (1 diff)

kernel/generic/include/mm/as.h

@@ -250 +250 @@
 extern int as_area_change_flags(as_t *, unsigned int, uintptr_t);
 
-//TODO REMOVE!
-extern as_area_t * find_locked_area(as_t *as, uintptr_t va);
-
 extern unsigned int as_area_get_flags(as_area_t *);
 extern bool as_area_check_access(as_area_t *, pf_access_t);

kernel/generic/src/ddi/ddi.c

@@ -361 +361 @@
 NO_TRACE static int dmamem_unmap_anonymous(uintptr_t virt)
 {
-        // TODO: This is an ugly hack
-        as_t *as = TASK->as;
-
-        mutex_lock(&as->lock);
-        as_area_t *area = find_locked_area(as, virt);
-        if (!area) {
-                mutex_unlock(&as->lock);
-                return ENOENT;
-        }
-        frame_free_noreserve(area->backend_data.base);
-        area->backend_data.base = 0;
-        area->backend_data.frames = 0;
-        mutex_unlock(&area->lock);
-        mutex_unlock(&as->lock);
-
-        return as_area_destroy(as, virt);
+        // TODO: implement unlocking & unmap
+        return EOK;
 }
 

kernel/generic/src/mm/as.c

@@ -672 +672 @@
         
         return NULL;
-}
-
-/** UGLY! UGLY! UGLY! */
-// TODO: REMOVE ASAP!
-as_area_t * find_locked_area(as_t *as, uintptr_t va)
-{
-        return find_area_and_lock(as, va);
 }