From: Rafael J. Wysocki Date: Fri, 15 Dec 2023 11:25:15 +0000 (+0100) Subject: ACPI: OSL: Use spin locks without disabling interrupts X-Git-Tag: v6.8-rc1~169^2~5^2~2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8e57de43076477c5cce113f2579bef02ce3e8b27;p=linux-block.git ACPI: OSL: Use spin locks without disabling interrupts After commit 7a36b901a6eb ("ACPI: OSL: Use a threaded interrupt handler for SCI") any ACPICA code never runs in a hardirq handler, so it need not dissable interrupts on the local CPU when acquiring a spin lock. Make it use spin locks without disabling interrupts. Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index a55cb578741a..70af3fbbebe5 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -1515,20 +1515,18 @@ void acpi_os_delete_lock(acpi_spinlock handle) acpi_cpu_flags acpi_os_acquire_lock(acpi_spinlock lockp) __acquires(lockp) { - acpi_cpu_flags flags; - - spin_lock_irqsave(lockp, flags); - return flags; + spin_lock(lockp); + return 0; } /* * Release a spinlock. See above. */ -void acpi_os_release_lock(acpi_spinlock lockp, acpi_cpu_flags flags) +void acpi_os_release_lock(acpi_spinlock lockp, acpi_cpu_flags not_used) __releases(lockp) { - spin_unlock_irqrestore(lockp, flags); + spin_unlock(lockp); } #ifndef ACPI_USE_LOCAL_CACHE