diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-04-01 11:43:08 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-04-01 11:43:08 +0000 |
| commit | 4c80b42683b88f933f87dbe79c0e94e336919938 (patch) | |
| tree | df19ddfcca3c9e28551d014957000da52bd47995 /usr/src/uts/intel/io/acpica/osl_ml.s | |
| parent | 88606cbe3645730adccc57e29f4b829af51c05f4 (diff) | |
| parent | 5338faaac2dc1b2a16cb1a986233578834926ce0 (diff) | |
| download | illumos-joyent-4c80b42683b88f933f87dbe79c0e94e336919938.tar.gz | |
[illumos-gate merge]
commit 5338faaac2dc1b2a16cb1a986233578834926ce0
12423 ipf: variable may be used uninitialized
commit 9b0bb795691f70ec1b1796f6d15266f82d7a3200
12349 clean up 32-bit assembly and lint
Conflicts:
usr/src/uts/sparc/v9/ml/lock_prim.s
usr/src/uts/intel/ia32/ml/lock_prim.s
usr/src/uts/intel/ia32/ml/copy.s
usr/src/uts/intel/Makefile.rules
usr/src/uts/i86pc/ml/syscall_asm_amd64.s
usr/src/uts/i86pc/ml/syscall_asm.s [deleted upstream]
Diffstat (limited to 'usr/src/uts/intel/io/acpica/osl_ml.s')
| -rw-r--r-- | usr/src/uts/intel/io/acpica/osl_ml.s | 91 |
1 files changed, 4 insertions, 87 deletions
diff --git a/usr/src/uts/intel/io/acpica/osl_ml.s b/usr/src/uts/intel/io/acpica/osl_ml.s index 9d6bbc97f4..81e7533e3a 100644 --- a/usr/src/uts/intel/io/acpica/osl_ml.s +++ b/usr/src/uts/intel/io/acpica/osl_ml.s @@ -23,14 +23,13 @@ * Use is subject to license terms. */ +/* + * Copyright 2019 Joyent, Inc. + */ + #include <sys/asm_linkage.h> #include <sys/asm_misc.h> -#if defined(lint) || defined(__lint) -#include <sys/types.h> -#include "acpi.h" -#endif /* lint */ - /* * Implementation as specific by ACPI 3.0 specification * section 5.2.10.1 @@ -54,16 +53,6 @@ /* Offset of GlobalLock element in FACS structure */ #define GlobalLock 0x10 -#if defined(lint) || defined(__lint) - -/* ARGSUSED */ -UINT32 -__acpi_acquire_global_lock(void *Facs) -{ return (0); } - -#else /* lint */ - -#if defined(__amd64) ENTRY(__acpi_acquire_global_lock) movq $0xff, %rax / error return if FACS is null orq %rdi, %rdi / %rdi contains pointer to FACS @@ -84,44 +73,7 @@ __acpi_acquire_global_lock(void *Facs) ret SET_SIZE(__acpi_acquire_global_lock) -#elif defined(__i386) - - ENTRY(__acpi_acquire_global_lock) - movl $0xff, %eax / error return if FACS is null - movl 4(%esp), %ecx / %ecx contains pointer to FACS - orl %ecx, %ecx - jz 1f - leal GlobalLock(%ecx), %ecx / make %ecx point at the lock -0: - movl (%ecx), %eax - movl %eax, %edx - andl $0xFFFFFFFE, %edx - btsl $1, %edx - adcl $0, %edx - lock - cmpxchgl %edx, (%ecx) - jnz 0b - cmpb $3, %dl - sbbl %eax, %eax -1: - ret - SET_SIZE(__acpi_acquire_global_lock) - -#endif /* i386 */ - -#endif /* lint */ - - -#if defined(lint) || defined(__lint) -/* ARGSUSED */ -UINT32 -__acpi_release_global_lock(void *Facs) -{ return (0); } - -#else /* lint */ - -#if defined(__amd64) ENTRY(__acpi_release_global_lock) xorq %rax, %rax / error return if FACS is null orq %rdi, %rdi / %rdi contains pointer to FACS @@ -139,48 +91,13 @@ __acpi_release_global_lock(void *Facs) ret SET_SIZE(__acpi_release_global_lock) -#elif defined(__i386) - - ENTRY(__acpi_release_global_lock) - xorl %eax, %eax / error return if FACS is null - movl 4(%esp), %ecx / %ecx contains pointer to FACS - orl %ecx, %ecx - jz 1f - leal GlobalLock(%ecx), %ecx / make %ecx point at the lock -0: - movl (%ecx), %eax - movl %eax, %edx - andl $0xFFFFFFFC, %edx - lock - cmpxchgl %edx, (%ecx) - jnz 0b - andl $1, %eax -1: - ret - SET_SIZE(__acpi_release_global_lock) - -#endif /* i386 */ - -#endif /* lint */ - /* * execute WBINVD instruction */ -#if defined(lint) || defined(__lint) - -/* ARGSUSED */ -void -__acpi_wbinvd(void) -{ } - -#else /* lint */ - ENTRY(__acpi_wbinvd) wbinvd ret SET_SIZE(__acpi_wbinvd) -#endif /* lint */ - |