projects
/
pintos-anon
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b042250
)
Update initialization order.
author
Ben Pfaff
<blp@cs.stanford.edu>
Sat, 11 Sep 2004 23:35:30 +0000
(23:35 +0000)
committer
Ben Pfaff
<blp@cs.stanford.edu>
Sat, 11 Sep 2004 23:35:30 +0000
(23:35 +0000)
src/threads/init.c
patch
|
blob
|
history
diff --git
a/src/threads/init.c
b/src/threads/init.c
index 589a23efc5b0ec779068052dcbbaaa136f036200..4859d425d712df888229d10c9dda4c539210f163 100644
(file)
--- a/
src/threads/init.c
+++ b/
src/threads/init.c
@@
-1,4
+1,5
@@
#include "threads/init.h"
#include "threads/init.h"
+#include <console.h>
#include <debug.h>
#include <limits.h>
#include <random.h>
#include <debug.h>
#include <limits.h>
#include <random.h>
@@
-53,10
+54,12
@@
int main (void) NO_RETURN;
int
main (void)
{
int
main (void)
{
- /*
Needed by printf(), so initialize them very early
. */
+ /*
Initialize everything needed for printf() first
. */
ram_init ();
ram_init ();
+ thread_init ();
vga_init ();
serial_init_poll ();
vga_init ();
serial_init_poll ();
+ console_init ();
/* Greet user. */
printf ("Pintos booting with %'d kB RAM...\n", ram_pages * 4);
/* Greet user. */
printf ("Pintos booting with %'d kB RAM...\n", ram_pages * 4);
@@
-65,7
+68,6
@@
main (void)
argv_init ();
/* Initialize memory system, segments, paging. */
argv_init ();
/* Initialize memory system, segments, paging. */
- thread_init ();
palloc_init ();
paging_init ();
#ifdef USERPROG
palloc_init ();
paging_init ();
#ifdef USERPROG
@@
-74,7
+76,7
@@
main (void)
#endif
malloc_init ();
#endif
malloc_init ();
- /* Set random seed if
not already done
. */
+ /* Set random seed if
argv_init() didn't
. */
random_init (0);
/* Initialize interrupt handlers. */
random_init (0);
/* Initialize interrupt handlers. */