From 0ff301cda68669c59351e5854ce98f2cf460543f Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Thu, 27 Mar 2025 11:39:12 -0400 Subject: pull upstream changes, add auto formatting --- kernel/startup.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kernel/startup.S') diff --git a/kernel/startup.S b/kernel/startup.S index 1cae13c..73a081e 100644 --- a/kernel/startup.S +++ b/kernel/startup.S @@ -15,7 +15,7 @@ #define KERNEL_SRC #define ASM_SRC - .arch i386 +# .arch i386 #include #include @@ -75,11 +75,11 @@ _start: */ .globl __bss_start, _end - movl $V2P(__bss_start), %edi + movl $V2PNC(__bss_start), %edi clearbss: movl $0, (%edi) addl $4, %edi - cmpl $V2P(_end), %edi + cmpl $V2PNC(_end), %edi jb clearbss #endif /* CLEAR_BSS */ @@ -96,7 +96,7 @@ clearbss: # set the page directory .globl firstpdir - movl $(V2P(firstpdir)+0x1000), %eax + movl $(V2PNC(firstpdir)), %eax movl %eax, %cr3 # turn on paging -- cgit v1.2.3-freya