Changeset 9970a5a in mainline for kernel/genarch/src/multiboot/multiboot2.c

Timestamp:

2012-01-27T23:24:27Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b3b571, fe56c08a

Parents:

d81eaf94 (diff), 221c9ec (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 from lp:~jakub/helenos/mm.

File:

• kernel/genarch/src/multiboot/multiboot2.c (modified) (1 diff)

kernel/genarch/src/multiboot/multiboot2.c

@@ -45 +45 @@
 {
         if (init.cnt < CONFIG_INIT_TASKS) {
-                init.tasks[init.cnt].addr = PA2KA(module->start);
+                init.tasks[init.cnt].paddr = module->start;
                 init.tasks[init.cnt].size = module->end - module->start;
                 multiboot_extract_command(init.tasks[init.cnt].name,