Merge tag 'vfio-v3.19-rc1' of git://github.com/awilliam/linux-vfio

[pandora-kernel.git] / drivers / acpi / osl.c

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 9964f70..f9eeae8 100644 (file)
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -436,7 +436,7 @@ static void acpi_os_drop_map_ref(struct acpi_ioremap *map)
 static void acpi_os_map_cleanup(struct acpi_ioremap *map)
 {
        if (!map->refcount) {
-               synchronize_rcu();
+               synchronize_rcu_expedited();
                acpi_unmap(map->phys, map->virt);
                kfree(map);
        }
@@ -1188,6 +1188,12 @@ EXPORT_SYMBOL(acpi_os_execute);
 
 void acpi_os_wait_events_complete(void)
 {
+       /*
+        * Make sure the GPE handler or the fixed event handler is not used
+        * on another CPU after removal.
+        */
+       if (acpi_irq_handler)
+               synchronize_hardirq(acpi_gbl_FADT.sci_interrupt);
        flush_workqueue(kacpid_wq);
        flush_workqueue(kacpi_notify_wq);
 }