Apply preempt_rt patch-4.9-rt1.patch.xz

[zynq/linux.git] / drivers / acpi / acpica / hwxface.c

diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
index 98c26ff394092fa74e5f63c1b910289343d7e4e0..6e236f2ea7912a34cdaa62950dbc02ba9642480c 100644 (file)
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -373,7 +373,7 @@ acpi_status acpi_write_bit_register(u32 register_id, u32 value)
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
-       lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
+       raw_spin_lock_irqsave(acpi_gbl_hardware_lock, lock_flags);
 
        /*
         * At this point, we know that the parent register is one of the
@@ -434,7 +434,7 @@ acpi_status acpi_write_bit_register(u32 register_id, u32 value)
 
 unlock_and_exit:
 
-       acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
+       raw_spin_unlock_irqrestore(acpi_gbl_hardware_lock, lock_flags);
        return_ACPI_STATUS(status);
 }