ARM/ARM64 is linked to reduced hardware now, global lock is not needed anymore.
Signed-off-by: Hanjun Guo hanjun.guo@linaro.org --- arch/arm/include/asm/acpi.h | 11 ----------- arch/arm64/include/asm/acpi.h | 11 ----------- 2 files changed, 22 deletions(-)
diff --git a/arch/arm/include/asm/acpi.h b/arch/arm/include/asm/acpi.h index cf67b09..651a15c 100644 --- a/arch/arm/include/asm/acpi.h +++ b/arch/arm/include/asm/acpi.h @@ -82,17 +82,6 @@ /* Blob handling macros */ #define ACPI_BLOB_HEADER_SIZE 8
-#ifndef CONFIG_ACPI_REDUCED_HARDWARE -int __acpi_acquire_global_lock(unsigned int *lock); -int __acpi_release_global_lock(unsigned int *lock); - -#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq) \ - ((Acq) = __acpi_acquire_global_lock(&facs->global_lock)) - -#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \ - ((Acq) = __acpi_release_global_lock(&facs->global_lock)) -#endif - /* Basic configuration for ACPI */ #ifdef CONFIG_ACPI extern int acpi_disabled; diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index bb9411f..8dc632a 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -60,17 +60,6 @@ /* Blob handling macros */ #define ACPI_BLOB_HEADER_SIZE 8
-#ifndef CONFIG_ACPI_REDUCED_HARDWARE -int __acpi_acquire_global_lock(unsigned int *lock); -int __acpi_release_global_lock(unsigned int *lock); - -#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq) \ - ((Acq) = __acpi_acquire_global_lock(&facs->global_lock)) - -#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \ - ((Acq) = __acpi_release_global_lock(&facs->global_lock)) -#endif - /* Basic configuration for ACPI */ #ifdef CONFIG_ACPI extern int acpi_disabled;