From 7b0428b07a4003b7fb55aecd6a35526c15595e7b Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 27 Oct 2015 18:40:58 +0100 Subject: [PATCH] Rename `multiboot` section to `multiboot_header` --- src/arch/x86_64/linker.ld | 2 +- src/arch/x86_64/multiboot_header.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arch/x86_64/linker.ld b/src/arch/x86_64/linker.ld index 8334f3d3..08222888 100644 --- a/src/arch/x86_64/linker.ld +++ b/src/arch/x86_64/linker.ld @@ -22,7 +22,7 @@ SECTIONS { .boot : { /* ensure that the multiboot header is at the beginning */ - KEEP(*(.multiboot)) + KEEP(*(.multiboot_header)) } .text : diff --git a/src/arch/x86_64/multiboot_header.asm b/src/arch/x86_64/multiboot_header.asm index ed8c11bd..40d0e0fe 100644 --- a/src/arch/x86_64/multiboot_header.asm +++ b/src/arch/x86_64/multiboot_header.asm @@ -12,7 +12,7 @@ ; See the License for the specific language governing permissions and ; limitations under the License. -section .multiboot +section .multiboot_header header_start: dd 0xe85250d6 ; magic number (multiboot 2) dd 0 ; architecture 0 (protected mode i386)