diff options
| author | Robert Morris <[email protected]> | 2012-08-28 12:57:13 -0400 |
|---|---|---|
| committer | Robert Morris <[email protected]> | 2012-08-28 12:57:13 -0400 |
| commit | c1ee7eb4d31bd17e48857479fec8f4c2065d4b7d (patch) | |
| tree | e54d9304b6f5d90bdf7a926808fd7d5923d39526 /exec.c | |
| parent | 8960f60b30b69a1f45ffa9d8b2b204714725f1fa (diff) | |
| parent | 951b77f7eced2165312d5c12d6256e874dba10f8 (diff) | |
| download | xv6-labs-c1ee7eb4d31bd17e48857479fec8f4c2065d4b7d.tar.gz xv6-labs-c1ee7eb4d31bd17e48857479fec8f4c2065d4b7d.tar.bz2 xv6-labs-c1ee7eb4d31bd17e48857479fec8f4c2065d4b7d.zip | |
Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6
Diffstat (limited to 'exec.c')
| -rw-r--r-- | exec.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -29,7 +29,7 @@ exec(char *path, char **argv) if(elf.magic != ELF_MAGIC) goto bad; - if((pgdir = setupkvm(kalloc)) == 0) + if((pgdir = setupkvm()) == 0) goto bad; // Load program into memory. |