xv6

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit 7472b2b451f100162fa4542f5bfe260385f861ad
parent 04be8fb232ef0f1f52444b0e513a9a256c5a031f
Author: Austin Clements <amdragon@mit.edu>
Date:   Tue, 31 Aug 2010 16:26:08 -0400

Fix too-long lines

Diffstat:
Mproc.c | 3++-
Mtrap.c | 3++-
2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/proc.c b/proc.c @@ -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; diff --git a/trap.c b/trap.c @@ -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;