summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/mips64/mips64/interrupt.c8
-rw-r--r--sys/arch/mips64/mips64/trap.c6
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c
index 3fa043b939c..43b6712201e 100644
--- a/sys/arch/mips64/mips64/interrupt.c
+++ b/sys/arch/mips64/mips64/interrupt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: interrupt.c,v 1.51 2009/11/21 23:28:14 syuu Exp $ */
+/* $OpenBSD: interrupt.c,v 1.52 2009/11/22 00:19:49 syuu Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -115,8 +115,9 @@ interrupt(struct trap_frame *trapframe)
trapdebug_enter(trapframe, 0);
#endif
- if(ci->ci_ipl < IPL_SCHED)
+ if (ci->ci_ipl < IPL_SCHED)
__mp_lock(&kernel_lock);
+
uvmexp.intrs++;
/* Mask out interrupts from cause that are unmasked */
@@ -149,7 +150,8 @@ interrupt(struct trap_frame *trapframe)
ci->ci_ipl = s; /* no-overhead splx */
__asm__ ("sync\n\t.set reorder\n");
}
- if(ci->ci_ipl < IPL_SCHED)
+
+ if (ci->ci_ipl < IPL_SCHED)
__mp_unlock(&kernel_lock);
}
diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c
index 91c3085d574..a5a264f0060 100644
--- a/sys/arch/mips64/mips64/trap.c
+++ b/sys/arch/mips64/mips64/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.51 2009/11/22 00:07:04 miod Exp $ */
+/* $OpenBSD: trap.c,v 1.52 2009/11/22 00:19:49 syuu Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -542,10 +542,10 @@ printf("SIG-BUSB @%p pc %p, ra %p\n", trapframe->badvaddr, trapframe->pc, trapfr
#endif
{
int nolock = (callp->sy_flags & SY_NOLOCK);
- if(!nolock)
+ if (!nolock)
KERNEL_PROC_LOCK(p);
i = (*callp->sy_call)(p, &args, rval);
- if(!nolock)
+ if (!nolock)
KERNEL_PROC_UNLOCK(p);
}
switch (i) {