Skip to content

Commit 0a69dc9

Browse files
author
Robert Morris
committed
even more explicit that entry.S is linked into kernel, unlike bootasm.S.
1 parent 858475e commit 0a69dc9

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

entry.S

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# The xv6 kernel starts executing in this file. This file is linked with
2+
# the kernel C code, so it can refer to kernel symbols such as main().
3+
# The boot block (bootasm.S and bootmain.c) jumps to entry below.
4+
15
# Multiboot header, for multiboot boot loaders like GNU Grub.
26
# http://www.gnu.org/software/grub/manual/multiboot/multiboot.html
37
#

entryother.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ start32:
5353
movl %cr4, %eax
5454
orl $(CR4_PSE), %eax
5555
movl %eax, %cr4
56-
# Use enterpgdir as our initial page table
56+
# Use entrypgdir as our initial page table
5757
movl (start-12), %eax
5858
movl %eax, %cr3
5959
# Turn on paging.

0 commit comments

Comments
 (0)