From 7894fcd21732dd2ddfbb9beca52d037a62ed11f4 Mon Sep 17 00:00:00 2001 From: Frans Kaashoek Date: Thu, 25 Aug 2016 09:13:00 -0400 Subject: =?UTF-8?q?Remove=20trailing=20white=20space=20with:=20=20for=20f?= =?UTF-8?q?=20in=20*.{h,c};=20do=20sed=20-i=20.sed=20's/[[:blank:]]*$//'?= =?UTF-8?q?=20$f;=20done=20(Thanks=20to=20Nicol=C3=A1s=20Wolovick)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- trap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'trap.c') diff --git a/trap.c b/trap.c index 3f80145..20ae62d 100644 --- a/trap.c +++ b/trap.c @@ -22,7 +22,7 @@ tvinit(void) for(i = 0; i < 256; i++) SETGATE(idt[i], 0, SEG_KCODE<<3, vectors[i], 0); SETGATE(idt[T_SYSCALL], 1, SEG_KCODE<<3, vectors[T_SYSCALL], DPL_USER); - + initlock(&tickslock, "time"); } @@ -77,7 +77,7 @@ trap(struct trapframe *tf) cpu->id, tf->cs, tf->eip); lapiceoi(); break; - + //PAGEBREAK: 13 default: if(proc == 0 || (tf->cs&3) == 0){ @@ -89,13 +89,13 @@ trap(struct trapframe *tf) // 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", - proc->pid, proc->name, tf->trapno, tf->err, cpu->id, tf->eip, + proc->pid, proc->name, tf->trapno, tf->err, cpu->id, tf->eip, rcr2()); proc->killed = 1; } // Force process exit if it has been killed and is in user space. - // (If it is still executing in the kernel, let it keep running + // (If it is still executing in the kernel, let it keep running // until it gets to the regular system call return.) if(proc && proc->killed && (tf->cs&3) == DPL_USER) exit(); -- cgit v1.2.3