Changeset fe56c08a in mainline for kernel/generic/src/mm/frame.c

Timestamp:

2012-01-28T09:17:24Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ca3d77a

Parents:

8da2c60 (diff), 9970a5a (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 with mainline

File:

• kernel/generic/src/mm/frame.c (modified) (2 diffs)

kernel/generic/src/mm/frame.c

@@ -924 +924 @@
                                 for (i = 0; i < init.cnt; i++)
                                         if (overlaps(addr, PFN2ADDR(confcount),
-                                            KA2PA(init.tasks[i].addr),
+                                            init.tasks[i].paddr,
                                             init.tasks[i].size)) {
                                                 overlap = true;
@@ -1251 +1251 @@
                 size_t i;
                 for (i = 0; i < init.cnt; i++) {
-                        pfn_t pfn = ADDR2PFN(KA2PA(init.tasks[i].addr));
+                        pfn_t pfn = ADDR2PFN(init.tasks[i].paddr);
                         frame_mark_unavailable(pfn,
                             SIZE2FRAMES(init.tasks[i].size));