Skip to content

Commit

Permalink
even more explicit that entry.S is linked into kernel, unlike bootasm.S.
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Morris committed Aug 10, 2016
1 parent 858475e commit 0a69dc9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions entry.S
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# The xv6 kernel starts executing in this file. This file is linked with
# the kernel C code, so it can refer to kernel symbols such as main().
# The boot block (bootasm.S and bootmain.c) jumps to entry below.

# Multiboot header, for multiboot boot loaders like GNU Grub.
# http://www.gnu.org/software/grub/manual/multiboot/multiboot.html
#
Expand Down
2 changes: 1 addition & 1 deletion entryother.S
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ start32:
movl %cr4, %eax
orl $(CR4_PSE), %eax
movl %eax, %cr4
# Use enterpgdir as our initial page table
# Use entrypgdir as our initial page table
movl (start-12), %eax
movl %eax, %cr3
# Turn on paging.
Expand Down

0 comments on commit 0a69dc9

Please sign in to comment.