On 11/09/2013 05:08 PM, al.stone@linaro.org wrote:
From: Al Stone ahs3@redhat.com
This patch is dependent on the CONFIG_ACPI_REDUCED_HARDWARE patch already being in place.
Signed-off-by: Al Stone al.stone@linaro.org
arch/arm/include/asm/acpi.h | 3 ++- arch/arm64/include/asm/acpi.h | 3 ++- drivers/acpi/plat/arm/boot.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/include/asm/acpi.h b/arch/arm/include/asm/acpi.h index ca7efaa..cf67b09 100644 --- a/arch/arm/include/asm/acpi.h +++ b/arch/arm/include/asm/acpi.h @@ -82,6 +82,7 @@ /* 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);
@@ -90,9 +91,9 @@ int __acpi_release_global_lock(unsigned int *lock);
#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \ ((Acq) = __acpi_release_global_lock(&facs->global_lock)) +#endif
/* Basic configuration for ACPI */ -/* BOZO: hardware reduced acpi only? */ #ifdef CONFIG_ACPI extern int acpi_disabled; extern int acpi_noirq; diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index a19b73f..bb9411f 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -60,6 +60,7 @@ /* 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);
@@ -68,9 +69,9 @@ int __acpi_release_global_lock(unsigned int *lock);
#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \ ((Acq) = __acpi_release_global_lock(&facs->global_lock)) +#endif
/* Basic configuration for ACPI */ -/* BOZO: hardware reduced acpi only? */ #ifdef CONFIG_ACPI extern int acpi_disabled; extern int acpi_noirq; diff --git a/drivers/acpi/plat/arm/boot.c b/drivers/acpi/plat/arm/boot.c index 4fcdd9f..1a6d225 100644 --- a/drivers/acpi/plat/arm/boot.c +++ b/drivers/acpi/plat/arm/boot.c @@ -786,6 +786,7 @@ static int __init parse_acpi(char *arg) } early_param("acpi", parse_acpi);
+#if (!ACPI_REDUCED_HARDWARE) int __acpi_acquire_global_lock(unsigned int *lock) { unsigned int old, new, val; @@ -807,3 +808,4 @@ int __acpi_release_global_lock(unsigned int *lock) } while (unlikely (val != old)); return old & 0x1; } +#endif
Note that this patch is not needed upstream until we get all the ARM ACPI infrastructure submitted also.