summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2021-08-10 07:12:41 -0400
committerRobert Morris <[email protected]>2021-08-10 07:12:41 -0400
commit6de0381d619f01777d84cbcd3affa96ad376c2e1 (patch)
tree81e0343e7df9c74b33180ca58c15322103763b54
parent3b3f83f10036391047a6e2fd3eb7b1a93aa05ed6 (diff)
downloadxv6-labs-6de0381d619f01777d84cbcd3affa96ad376c2e1.tar.gz
xv6-labs-6de0381d619f01777d84cbcd3affa96ad376c2e1.tar.bz2
xv6-labs-6de0381d619f01777d84cbcd3affa96ad376c2e1.zip
check for alignment just once
-rw-r--r--kernel/exec.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/exec.c b/kernel/exec.c
index 0e8762f..26fc8ec 100644
--- a/kernel/exec.c
+++ b/kernel/exec.c
@@ -52,7 +52,7 @@ exec(char *path, char **argv)
if((sz1 = uvmalloc(pagetable, sz, ph.vaddr + ph.memsz)) == 0)
goto bad;
sz = sz1;
- if(ph.vaddr % PGSIZE != 0)
+ if((ph.vaddr % PGSIZE) != 0)
goto bad;
if(loadseg(pagetable, ph.vaddr, ip, ph.off, ph.filesz) < 0)
goto bad;
@@ -138,9 +138,6 @@ loadseg(pagetable_t pagetable, uint64 va, struct inode *ip, uint offset, uint sz
uint i, n;
uint64 pa;
- if((va % PGSIZE) != 0)
- panic("loadseg: va must be page aligned");
-
for(i = 0; i < sz; i += PGSIZE){
pa = walkaddr(pagetable, va + i);
if(pa == 0)