Merge branch 'master' into upstream

1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index 326af8fc0ce7..33db2241044e 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.c
@@ -45,6 +45,7 @@
 #include <acpi/acnamesp.h>
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
+#include <linux/nmi.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsinit")
@@ -534,7 +535,15 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
         info->parameter_type = ACPI_PARAM_ARGS;
         info->flags = ACPI_IGNORE_RETURN_VALUE;
 
+        /*
+         * Some hardware relies on this being executed as atomically
+         * as possible (without an NMI being received in the middle of
+         * this) - so disable NMIs and initialize the device:
+         */
+        acpi_nmi_disable();
         status = acpi_ns_evaluate(info);
+        acpi_nmi_enable();
+
         if (ACPI_SUCCESS(status)) {
                 walk_info->num_INI++;