aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanjun Guo <hanjun.guo@linaro.org>2013-11-21 14:39:19 +0800
committerGraeme Gregory <graeme.gregory@linaro.org>2013-11-21 10:01:44 +0000
commitd9cbb883c75b1b54eca4714cbe212fe34978f278 (patch)
tree2a5aedfda0cb9ffc876c0b7c629ed53e7b142d30
parentb073c7251ee43da3df7974333ac13ca988b6c7dc (diff)
downloadleg-kernel-d9cbb883c75b1b54eca4714cbe212fe34978f278.tar.gz
ARM / ACPI: Remove the global lock definition in header file
ARM/ARM64 is linked to reduced hardware now, global lock is not needed anymore. Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org> Acked-by: Graeme Gregory <graeme.gregory@linaro.org>
-rw-r--r--arch/arm/include/asm/acpi.h11
-rw-r--r--arch/arm64/include/asm/acpi.h11
2 files changed, 0 insertions, 22 deletions
diff --git a/arch/arm/include/asm/acpi.h b/arch/arm/include/asm/acpi.h
index cf67b0943e42..651a15ce3f0d 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 bb9411fad04c..8dc632a94e07 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;