projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comment.
[pintos-anon]
/
src
/
threads
/
init.c
diff --git
a/src/threads/init.c
b/src/threads/init.c
index cb4edf9deb5a7a39eae5b12f8f030e4d3f3e1e2b..a624ef57edf02a2b3aa7b392e5a4fc37abded034 100644
(file)
--- 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/io.h"
#include "threads/loader.h"
#include "threads/malloc.h"
-#include "threads/mmu.h"
#include "threads/palloc.h"
#include "threads/palloc.h"
+#include "threads/pte.h"
#include "threads/thread.h"
#ifdef USERPROG
#include "userprog/process.h"
#include "threads/thread.h"
#ifdef USERPROG
#include "userprog/process.h"
@@
-46,7
+46,7
@@
uint32_t *base_page_dir;
bool enable_mlfqs;
#ifdef FILESYS
bool enable_mlfqs;
#ifdef FILESYS
-/* -f: Format the filesystem? */
+/* -f: Format the file
system? */
static bool format_filesys;
#endif
static bool format_filesys;
#endif
@@
-90,6
+90,9
@@
main (void)
argv = read_command_line ();
argv = parse_options (argv);
argv = read_command_line ();
argv = parse_options (argv);
+ /* Set random seed if parse_options() didn't. */
+ random_init (0);
+
/* Initialize memory system. */
palloc_init ();
malloc_init ();
/* Initialize memory system. */
palloc_init ();
malloc_init ();
@@
-101,9
+104,6
@@
main (void)
gdt_init ();
#endif
gdt_init ();
#endif
- /* Set random seed if parse_options() didn't. */
- random_init (0);
-
/* Initialize interrupt handlers. */
intr_init ();
timer_init ();
/* Initialize interrupt handlers. */
intr_init ();
timer_init ();
@@
-119,7
+119,7
@@
main (void)
timer_calibrate ();
#ifdef FILESYS
timer_calibrate ();
#ifdef FILESYS
- /* Initialize filesystem. */
+ /* Initialize file
system. */
disk_init ();
filesys_init (format_filesys);
#endif
disk_init ();
filesys_init (format_filesys);
#endif