Remove the global lock handling as this is not needed for the reduced hardware platform that arm/arm64 is currently defined as.
Signed-off-by: Graeme Gregory graeme.gregory@linaro.org --- drivers/acpi/plat/arm/boot.c | 24 ------------------------ 1 file changed, 24 deletions(-)
diff --git a/drivers/acpi/plat/arm/boot.c b/drivers/acpi/plat/arm/boot.c index 1a6d225..3bfe86e 100644 --- a/drivers/acpi/plat/arm/boot.c +++ b/drivers/acpi/plat/arm/boot.c @@ -785,27 +785,3 @@ static int __init parse_acpi(char *arg) return 0; } early_param("acpi", parse_acpi); - -#if (!ACPI_REDUCED_HARDWARE) -int __acpi_acquire_global_lock(unsigned int *lock) -{ - unsigned int old, new, val; - do { - old = *lock; - new = (((old & ~0x3) + 2) + ((old >> 1) & 0x1)); - val = cmpxchg(lock, old, new); - } while (unlikely (val != old)); - return (new < 3) ? -1 : 0; -} - -int __acpi_release_global_lock(unsigned int *lock) -{ - unsigned int old, new, val; - do { - old = *lock; - new = old & ~0x3; - val = cmpxchg(lock, old, new); - } while (unlikely (val != old)); - return old & 0x1; -} -#endif
On 11/15/2013 03:57 AM, Graeme Gregory wrote:
Remove the global lock handling as this is not needed for the reduced hardware platform that arm/arm64 is currently defined as.
Signed-off-by: Graeme Gregory graeme.gregory@linaro.org
drivers/acpi/plat/arm/boot.c | 24 ------------------------ 1 file changed, 24 deletions(-)
diff --git a/drivers/acpi/plat/arm/boot.c b/drivers/acpi/plat/arm/boot.c index 1a6d225..3bfe86e 100644 --- a/drivers/acpi/plat/arm/boot.c +++ b/drivers/acpi/plat/arm/boot.c @@ -785,27 +785,3 @@ static int __init parse_acpi(char *arg) return 0; } early_param("acpi", parse_acpi);
-#if (!ACPI_REDUCED_HARDWARE) -int __acpi_acquire_global_lock(unsigned int *lock) -{
- unsigned int old, new, val;
- do {
old = *lock;
new = (((old & ~0x3) + 2) + ((old >> 1) & 0x1));
val = cmpxchg(lock, old, new);
- } while (unlikely (val != old));
- return (new < 3) ? -1 : 0;
-}
-int __acpi_release_global_lock(unsigned int *lock) -{
- unsigned int old, new, val;
- do {
old = *lock;
new = old & ~0x3;
val = cmpxchg(lock, old, new);
- } while (unlikely (val != old));
- return old & 0x1;
-} -#endif
Just about identical to the one in the reduced hw patches :).
Acked-by: Al Stone al.stone@linaro.org