diff options
| author | Robert Morris <[email protected]> | 2010-08-31 19:21:52 -0400 |
|---|---|---|
| committer | Robert Morris <[email protected]> | 2010-08-31 19:21:52 -0400 |
| commit | 23c3e52c2fb5f1709bf5053a8e93161931b56bf9 (patch) | |
| tree | cb51f605a35de8980efce5dcab3e5df9757c022a /proc.c | |
| parent | 3597d5dc704c192a85b9902f7264fe9025aad277 (diff) | |
| parent | 5048762c7e27789a014cc1e74e1002e749c924ce (diff) | |
| download | xv6-labs-23c3e52c2fb5f1709bf5053a8e93161931b56bf9.tar.gz xv6-labs-23c3e52c2fb5f1709bf5053a8e93161931b56bf9.tar.bz2 xv6-labs-23c3e52c2fb5f1709bf5053a8e93161931b56bf9.zip | |
Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6
Diffstat (limited to 'proc.c')
| -rw-r--r-- | proc.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -120,7 +120,8 @@ userinit(void) panic("userinit: out of memory?"); if (!allocuvm(p->pgdir, 0x0, (int)_binary_initcode_size)) panic("userinit: out of memory?"); - inituvm(p->pgdir, 0x0, _binary_initcode_start, (int)_binary_initcode_size); + inituvm(p->pgdir, 0x0, _binary_initcode_start, + (int)_binary_initcode_size); p->sz = PGROUNDUP((int)_binary_initcode_size); memset(p->tf, 0, sizeof(*p->tf)); p->tf->cs = (SEG_UCODE << 3) | DPL_USER; |