diff options
| author |   pirofti <pirofti@openbsd.org> | 2012-09-25 09:58:57 +0000 |
|---|---|---|
| committer | pirofti <pirofti@openbsd.org> | 2012-09-25 09:58:57 +0000 |
| commit | 44da3fc4cd7dd256a6f0cf8d6cc1f12724e4e805 (patch) | |
| tree | baeed07ecc8f7180ccb09dd3a75dc20975523cbf | |
| parent | Reduce the diff between amd64/stand and i386/stand, requested by deraadt@. (diff) | |
| download | wireguard-openbsd-44da3fc4cd7dd256a6f0cf8d6cc1f12724e4e805.tar.xz wireguard-openbsd-44da3fc4cd7dd256a6f0cf8d6cc1f12724e4e805.zip | |
Remove unused acpi locking code.
To be replaced with higher level C routines once we settle for a common
consistent set of atomic operations across platforms.
Discussed with and okay by deraadt@ and kettenis@.
| -rw-r--r-- | sys/arch/amd64/amd64/locore.S | 30 | ||||
| -rw-r--r-- | sys/arch/i386/i386/locore.s | 30 |
2 files changed, 2 insertions, 58 deletions
diff --git a/sys/arch/amd64/amd64/locore.S b/sys/arch/amd64/amd64/locore.S index b6a0059adbc..d20c9575481 100644 --- a/sys/arch/amd64/amd64/locore.S +++ b/sys/arch/amd64/amd64/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.52 2012/05/06 04:20:40 guenther Exp $ */ +/* $OpenBSD: locore.S,v 1.53 2012/09/25 09:58:57 pirofti Exp $ */ /* $NetBSD: locore.S,v 1.13 2004/03/25 18:33:17 drochner Exp $ */ /* @@ -1058,31 +1058,3 @@ ENTRY(pagezero) sfence ret -#if NACPI > 0 -ENTRY(acpi_acquire_global_lock) - movq %rdi, %rcx -1: movl (%rcx), %eax - movl %eax, %edx - andl $~1, %edx - btsl $1, %edx - adcl $0, %edx - lock - cmpxchgl %edx, (%rcx) - jnz 1b - andl $3, %edx - cmpl $3, %edx - sbb %eax, %eax - ret - -ENTRY(acpi_release_global_lock) - movq %rdi, %rcx -1: movl (%rcx), %eax - movl %eax, %edx - andl $~3, %edx - lock - cmpxchgl %edx, (%rcx) - jnz 1b - andl $1, %eax - ret -#endif - diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s index 7e3504707ff..e07b5993701 100644 --- a/sys/arch/i386/i386/locore.s +++ b/sys/arch/i386/i386/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.141 2011/11/02 23:53:44 jsg Exp $ */ +/* $OpenBSD: locore.s,v 1.142 2012/09/25 09:58:57 pirofti Exp $ */ /* $NetBSD: locore.s,v 1.145 1996/05/03 19:41:19 christos Exp $ */ /*- @@ -1651,34 +1651,6 @@ ENTRY(i686_pagezero) ret #endif -#if NACPI > 0 -ENTRY(acpi_acquire_global_lock) - movl 4(%esp), %ecx -1: movl (%ecx), %eax - movl %eax, %edx - andl $~1, %edx - btsl $1, %edx - adcl $0, %edx - lock - cmpxchgl %edx, (%ecx) - jnz 1b - andl $3, %edx - cmpl $3, %edx - sbb %eax, %eax - ret - -ENTRY(acpi_release_global_lock) - movl 4(%esp), %ecx -1: movl (%ecx), %eax - movl %eax, %edx - andl $~3, %edx - lock - cmpxchgl %edx, (%ecx) - jnz 1b - andl $1, %eax - ret -#endif - /* * ucas_32(volatile int32_t *uptr, int32_t old, int32_t new); */ |