diff options
| author | Austin Clements <amdragon@mit.edu> | 2010-08-31 16:26:08 -0400 | 
|---|---|---|
| committer | Austin Clements <amdragon@mit.edu> | 2010-08-31 16:26:08 -0400 | 
| commit | 7472b2b451f100162fa4542f5bfe260385f861ad (patch) | |
| tree | 134b13a09008be741b55172bb065c00020fb5d2b | |
| parent | 04be8fb232ef0f1f52444b0e513a9a256c5a031f (diff) | |
| download | xv6-labs-7472b2b451f100162fa4542f5bfe260385f861ad.tar.gz xv6-labs-7472b2b451f100162fa4542f5bfe260385f861ad.tar.bz2 xv6-labs-7472b2b451f100162fa4542f5bfe260385f861ad.zip | |
Fix too-long lines
| -rw-r--r-- | proc.c | 3 | ||||
| -rw-r--r-- | trap.c | 3 | 
2 files changed, 4 insertions, 2 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; @@ -83,7 +83,8 @@ trap(struct trapframe *tf)        panic("trap");      }      // In user space, assume process misbehaved. -    cprintf("pid %d %s: trap %d err %d on cpu %d eip 0x%x addr 0x%x--kill proc\n", +    cprintf("pid %d %s: trap %d err %d on cpu %d " +            "eip 0x%x addr 0x%x--kill proc\n",              proc->pid, proc->name, tf->trapno, tf->err, cpu->id, tf->eip,   	    rcr2());      proc->killed = 1; | 
