Changeset fe56c08a in mainline for kernel/genarch/src/multiboot/multiboot.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/genarch/src/multiboot/multiboot.c (modified) (1 diff)

kernel/genarch/src/multiboot/multiboot.c

@@ -77 +77 @@
                         break;
                 
-                init.tasks[init.cnt].addr = PA2KA(mods[i].start);
+                init.tasks[init.cnt].paddr = mods[i].start;
                 init.tasks[init.cnt].size = mods[i].end - mods[i].start;