summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2017-08-07 13:29:11 -0400
committerFrans Kaashoek <[email protected]>2017-08-07 13:29:11 -0400
commit02493116750028a155227ac7e20de84a61513440 (patch)
treee0bc4866c18ee91cd149bc3c55fc3ad642a75745
parent61f26e3c9770371dd7a5477d79fdf031ba4738c4 (diff)
parent03b30863279b111fb6b9f154a9bdaa831114adfb (diff)
downloadxv6-labs-02493116750028a155227ac7e20de84a61513440.tar.gz
xv6-labs-02493116750028a155227ac7e20de84a61513440.tar.bz2
xv6-labs-02493116750028a155227ac7e20de84a61513440.zip
Merge branch 'patch-1' of https://github.com/Saarett/xv6-public
-rw-r--r--vm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/vm.c b/vm.c
index 9db8b67..39642f4 100644
--- a/vm.c
+++ b/vm.c
@@ -137,8 +137,10 @@ setupkvm(void)
panic("PHYSTOP too high");
for(k = kmap; k < &kmap[NELEM(kmap)]; k++)
if(mappages(pgdir, k->virt, k->phys_end - k->phys_start,
- (uint)k->phys_start, k->perm) < 0)
+ (uint)k->phys_start, k->perm) < 0) {
+ freevm(pgdir);
return 0;
+ }
return pgdir;
}