diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2011-10-12 18:30:10 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2011-10-12 18:30:10 +0000 |
| commit | 08a4add62fa6d75b3ebe459572210d2b4b84f9df (patch) | |
| tree | 14817ef85ec0c2d2a494dfde64b00cbfa77ef9cf /sys/arch/amd64 | |
| parent | 04f0a71606ccfd64e25eae6175b7400c99826849 (diff) | |
Remove all MD diagnostics in cpu_switchto(), and move them to MI code if
they apply.
ok oga@ deraadt@
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/locore.S | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/sys/arch/amd64/amd64/locore.S b/sys/arch/amd64/amd64/locore.S index 16fe9ef57e3..5af0882f203 100644 --- a/sys/arch/amd64/amd64/locore.S +++ b/sys/arch/amd64/amd64/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.49 2011/09/03 01:21:00 guenther Exp $ */ +/* $OpenBSD: locore.S,v 1.50 2011/10/12 18:30:07 miod Exp $ */ /* $NetBSD: locore.S,v 1.13 2004/03/25 18:33:17 drochner Exp $ */ /* @@ -724,14 +724,6 @@ ENTRY(cpu_switchto) movq %rdi, %r13 movq %rsi, %r12 -#ifdef DIAGNOSTIC - xorq %rax,%rax - cmpq %rax,P_WCHAN(%r12) - jne _C_LABEL(switch_error2) - cmpb $SRUN,P_STAT(%r12) - jne _C_LABEL(switch_error3) -#endif - /* Record new proc. */ movb $SONPROC,P_STAT(%r12) # p->p_stat = SONPROC SET_CURPROC(%r12,%rcx) @@ -858,21 +850,6 @@ ENTRY(cpu_idle_leave) .globl _C_LABEL(panic) #ifdef DIAGNOSTIC -NENTRY(switch_error1) - movabsq $1f,%rdi - call _C_LABEL(panic) - /* NOTREACHED */ -1: .asciz "cpu_switch 1" -NENTRY(switch_error2) - movabsq $1f,%rdi - call _C_LABEL(panic) - /* NOTREACHED */ -1: .asciz "cpu_switch 2" -NENTRY(switch_error3) - movabsq $1f,%rdi - call _C_LABEL(panic) - /* NOTREACHED */ -1: .asciz "cpu_switch 3" NENTRY(switch_pmcpu_set) movabsq $1f,%rdi call _C_LABEL(panic) |