changed _start and _end to _kernel_start and _kernel_end

2 files changed, 5 insertions, 5 deletions

diff --git a/kernel/arch/i386/linker.ld b/kernel/arch/i386/linker.ld
index bac95d2..c4bfa3b 100644
--- a/kernel/arch/i386/linker.ld
+++ b/kernel/arch/i386/linker.ld
@@ -6,7 +6,7 @@ SECTIONS
     . = 1M;

 

     /* Used to get the beginning and end address of the kernel */

-    _begin = .;

+    _kernel_begin = .;

 

     /* code. multiboot header comes first */

     .text BLOCK(4K) : ALIGN(4K)

@@ -34,5 +34,5 @@ SECTIONS
         *(.bss)

     }

 

-    _end = .;

+    _kernel_end = .;

 }
\ No newline at end of file
diff --git a/kernel/kernel.cpp b/kernel/kernel.cpp
index 877f860..a877be2 100644
--- a/kernel/kernel.cpp
+++ b/kernel/kernel.cpp
@@ -8,8 +8,8 @@
 #include <dev/ps2kbd.h>

 

 // linker symbols

-unsigned int _begin;

-unsigned int _end;

+unsigned int _kernel_begin;

+unsigned int _kernel_end;

 

 

 extern "C" void kernel_main(void) {

@@ -21,5 +21,5 @@ extern "C" void kernel_main(void) {
 

     printf("Hello world!\n");

     printf("a%db\n", 1);

-    printf("_begin: %x, _end: %x", &_begin, &_end);

+    printf("_begin: %x, _end: %x", &_kernel_begin, &_kernel_end);

 }