Changeset b0b4592e in mainline for kernel/generic/src/ddi/ddi.c

Timestamp:

2014-03-15T19:21:53Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c773adc

Parents:

2034f98 (diff), 8cffdf5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/generic/src/ddi/ddi.c (modified) (4 diffs)

kernel/generic/src/ddi/ddi.c

@@ -121 +121 @@
         backend_data.base = phys;
         backend_data.frames = pages;
+        backend_data.anonymous = false;
         
         /*
@@ -329 +330 @@
         
         size_t frames = SIZE2FRAMES(size);
-        *phys = frame_alloc(frames, FRAME_NO_RESERVE, constraint);
+        *phys = frame_alloc(frames, FRAME_ATOMIC, constraint);
         if (*phys == 0)
                 return ENOMEM;
@@ -336 +337 @@
         backend_data.base = *phys;
         backend_data.frames = frames;
+        backend_data.anonymous = true;
         
         if (!as_area_create(TASK->as, map_flags, size,
             AS_AREA_ATTR_NONE, &phys_backend, &backend_data, virt, bound)) {
-                frame_free_noreserve(*phys, frames);
+                frame_free(*phys, frames);
                 return ENOMEM;
         }
@@ -354 +356 @@
 NO_TRACE static int dmamem_unmap_anonymous(uintptr_t virt)
 {
-        // TODO: implement unlocking & unmap
-        return EOK;
+        return as_area_destroy(TASK->as, virt);
 }