summaryrefslogtreecommitdiff
path: root/kernel/proc.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2019-08-18 14:35:11 -0400
committerFrans Kaashoek <[email protected]>2019-08-18 14:35:11 -0400
commit2501560cd691fcdb9c310dccc14ac4e7486c99d9 (patch)
tree2bbda111baaeda8c4b8363422b8e9f39910177e6 /kernel/proc.c
parenta9953236cc9f1befb625575671bc39f1ab254bf0 (diff)
downloadxv6-labs-2501560cd691fcdb9c310dccc14ac4e7486c99d9.tar.gz
xv6-labs-2501560cd691fcdb9c310dccc14ac4e7486c99d9.tar.bz2
xv6-labs-2501560cd691fcdb9c310dccc14ac4e7486c99d9.zip
Cosmetic cleanup: fsinit reads sb and calls loginit. initialize icache
in main.c and don't make it disk specific; the icache is shared. This doesn't matter since we have only one disk, but conceptually cleaner and maybe helpful to students for mount lab.
Diffstat (limited to 'kernel/proc.c')
-rw-r--r--kernel/proc.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/proc.c b/kernel/proc.c
index 1f6bfcc..3d65b46 100644
--- a/kernel/proc.c
+++ b/kernel/proc.c
@@ -493,12 +493,11 @@ forkret(void)
release(&myproc()->lock);
if (first) {
- // Some initialization functions must be run in the context
- // of a regular process (e.g., they call sleep), and thus cannot
+ // File system initialization must be run in the context of a
+ // regular process (e.g., because it calls sleep), and thus cannot
// be run from main().
first = 0;
- iinit(ROOTDEV);
- initlog(ROOTDEV);
+ fsinit(ROOTDEV);
}
usertrapret();