Move _kernel_cr3 back into the .bss segment since we can't get around mapping that...

diff --git a/kernel/arch/entry.S b/kernel/arch/entry.S
index 13e63d0833b3be8ff4791ac939b0c682484da4af..99481bdb3dc72ca5c315ef986d28d46e847ecaa9 100644 (file)
--- a/kernel/arch/entry.S
+++ b/kernel/arch/entry.S
@@ -83,7 +83,7 @@
 .global _int_restore
 
 .extern _cpu
-.global _kernel_cr3
+.extern _kernel_cr3
 
 .extern _exc_handle
 .extern _int_handle
@@ -445,6 +445,3 @@ _return_to_kernel:
     popa
     add     $8, %esp
     iret
-
-_kernel_cr3:
-       .long   0

diff --git a/kernel/arch/paging.c b/kernel/arch/paging.c
index b72f3f60a970ce5040fc82f78f06572fb2482377..978cf541a351b3f1a59e673e39b0a9941899cd4f 100644 (file)
--- a/kernel/arch/paging.c
+++ b/kernel/arch/paging.c
@@ -31,7 +31,6 @@
 #define _frame_clear(addr)  _frame_map[(addr) >> 17] &= ~(1 << (((addr) >> 12) & 0x1f))
 #define _frame_get(addr)    (_frame_map[(addr) >> 17] & (1 << (((addr) >> 12) & 0x1f)))
 
-extern u32_t _kernel_cr3;
 extern u32_t _corax_rodata;
 extern u32_t _corax_data;
 extern u32_t _corax_bss;
@@ -46,6 +45,7 @@ extern u32_t _mem_start;
 #define BSS_BASE    (&_corax_bss)
 #define BSS_SIZE    ((u32_t)&_mem_start - (u32_t)&_corax_bss)
 
+u32_t _kernel_cr3 = 0;
 static u32_t _pg_flags = 0;
 static u32_t *_frame_map;
 static u32_t _nframes;