summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--proc.c3
-rw-r--r--trap.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/proc.c b/proc.c
index 5ac2780..0dc77b8 100644
--- 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
index daee22f..ae26739 100644
--- 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;