summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2018-04-15 15:53:33 +0200
committerRichard Braun <rbraun@sceen.net>2018-06-27 11:38:40 +0200
commitbac9dd7e6a5a8e657cc578101bff1978a638ec9e (patch)
tree235598aab109012b2305027cbee18099772fd8d2
parentb2ff0c98f026fa7feda1b658979c7e2d04404ae6 (diff)
x86/boot: rename entry point
-rw-r--r--arch/x86/machine/boot_asm.S4
-rw-r--r--arch/x86/x15.lds.S2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/machine/boot_asm.S b/arch/x86/machine/boot_asm.S
index 0aaf342e..83e585aa 100644
--- a/arch/x86/machine/boot_asm.S
+++ b/arch/x86/machine/boot_asm.S
@@ -53,7 +53,7 @@ ASM_END(boot_header)
/*
* Entry point.
*/
-ASM_ENTRY(_start)
+ASM_ENTRY(boot_start)
lgdt boot_gdtr
/* Keep %eax and %ebx */
@@ -116,7 +116,7 @@ ASM_ENTRY(_start)
/* Never reached */
nop
-ASM_END(_start)
+ASM_END(boot_start)
.code32
diff --git a/arch/x86/x15.lds.S b/arch/x86/x15.lds.S
index 260d230c..167e5eb6 100644
--- a/arch/x86/x15.lds.S
+++ b/arch/x86/x15.lds.S
@@ -6,7 +6,7 @@ OUTPUT_FORMAT("elf32-i386")
OUTPUT_ARCH(i386)
#endif /* __LP64__ */
-ENTRY(_start)
+ENTRY(boot_start)
#include <kern/init.h>
#include <machine/boot.h>