summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordzwdz2021-07-17 16:31:53 +0200
committerdzwdz2021-07-17 16:31:53 +0200
commitac0e85e081a1a806c8728f96ad9128a369ffc494 (patch)
treeb48b6508add84dec6c9da585edb2f8cdbe20aa20
parent3159a40bdb65f215f7ecce831998e8139e57cf02 (diff)
rename _kernel_end to _bss_end
-rw-r--r--linker.ld2
-rw-r--r--src/arch/i386/multiboot.s2
-rw-r--r--src/kernel/mem.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/linker.ld b/linker.ld
index d2aa8bd..650ecd7 100644
--- a/linker.ld
+++ b/linker.ld
@@ -26,5 +26,5 @@ SECTIONS
. += 16K;
stack_top = .;
}
- _kernel_end = (. + 0xFFF) & ~0xFFF; /* aligned to 4K */
+ _bss_end = (. + 0xFFF) & ~0xFFF; /* aligned to 4K */
}
diff --git a/src/arch/i386/multiboot.s b/src/arch/i386/multiboot.s
index d67110f..db502cc 100644
--- a/src/arch/i386/multiboot.s
+++ b/src/arch/i386/multiboot.s
@@ -15,5 +15,5 @@ multiboot_header:
.long multiboot_header // header_addr
.long multiboot_header // load_addr
.long _data_end // load_end_addr
- .long _kernel_end // bss_end_addr
+ .long _bss_end // bss_end_addr
.long _start // entry_addr
diff --git a/src/kernel/mem.c b/src/kernel/mem.c
index f383e8b..d002050 100644
--- a/src/kernel/mem.c
+++ b/src/kernel/mem.c
@@ -1,11 +1,11 @@
#include <arch/generic.h>
#include <kernel/mem.h>
-extern void *_kernel_end;
+extern void *_bss_end;
static void *highest_page;
void mem_init() {
- highest_page = &_kernel_end;
+ highest_page = &_bss_end;
}
void *page_alloc(size_t pages) {