X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Finit.c;h=57797be7dbdd023a351b04798ad6eebe7acf481a;hb=cb3a47ebe6359d9902dd0a3a769d6ab524e7e37c;hp=a899921d953aef64ba2c88b01e8a15cece263278;hpb=0a7ce50c8f6dd074fabe327cdad8502097816f3c;p=pintos-anon diff --git a/src/threads/init.c b/src/threads/init.c index a899921..57797be 100644 --- a/src/threads/init.c +++ b/src/threads/init.c @@ -16,8 +16,8 @@ #include "threads/io.h" #include "threads/loader.h" #include "threads/malloc.h" -#include "threads/mmu.h" #include "threads/palloc.h" +#include "threads/pte.h" #include "threads/thread.h" #ifdef USERPROG #include "userprog/process.h" @@ -188,7 +188,8 @@ paging_init (void) /* Store the physical address of the page directory into CR3 aka PDBR (page directory base register). This activates our new page tables immediately. See [IA32-v2a] "MOV--Move - to/from Control Registers" and [IA32-v3] 3.7.5. */ + to/from Control Registers" and [IA32-v3a] 3.7.5 "Base Address + of the Page Directory". */ asm volatile ("movl %0, %%cr3" :: "r" (vtop (base_page_dir))); } @@ -253,7 +254,6 @@ parse_options (char **argv) #endif else PANIC ("unknown option `%s' (use -h for help)", name); - } return argv;