summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/arch/i386/multiboot.s2
-rw-r--r--src/kernel/mem.c4
2 files changed, 3 insertions, 3 deletions
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) {