Changeset 95c675b in mainline for kernel/arch/amd64/src/boot/multiboot2.S

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• kernel/arch/amd64/src/boot/multiboot2.S (modified) (1 diff)

kernel/arch/amd64/src/boot/multiboot2.S

@@ -54 +54 @@
                 .word MULTIBOOT2_FLAGS_REQUIRED
                 .long tag_info_req_end - tag_info_req_start
+                .long MULTIBOOT2_TAG_CMDLINE
                 .long MULTIBOOT2_TAG_MODULE
                 .long MULTIBOOT2_TAG_MEMMAP