Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

3 files changed, 12 insertions, 7 deletions

diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index 1ac197ccfc80..d11620018421 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -491,12 +491,6 @@ acpi_ds_load2_begin_op (
                 if ((!(walk_state->op_info->flags & AML_NSOPCODE) &&
                           (walk_state->opcode != AML_INT_NAMEPATH_OP)) ||
                         (!(walk_state->op_info->flags & AML_NAMED))) {
-                        if ((walk_state->op_info->class == AML_CLASS_EXECUTE) ||
-                                (walk_state->op_info->class == AML_CLASS_CONTROL)) {
-                                ACPI_REPORT_WARNING ((
-                                        "Encountered executable code at module level, [%s]\n",
-                                        acpi_ps_get_opcode_name (walk_state->opcode)));
-                        }
                         return_ACPI_STATUS (AE_OK);
                 }
 
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index bdd9f37f8101..7289da3c4db6 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -145,10 +145,14 @@ acpi_os_vprintf(const char *fmt, va_list args)
 #endif
 }
 
+extern int acpi_in_resume;
 void *
 acpi_os_allocate(acpi_size size)
 {
-        return kmalloc(size, GFP_KERNEL);
+        if (acpi_in_resume)
+                return kmalloc(size, GFP_ATOMIC);
+        else
+                return kmalloc(size, GFP_KERNEL);
 }
 
 void
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 65cea07abbc3..834c2ceff1aa 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -798,6 +798,11 @@ acpi_pci_link_resume(
                 return_VALUE(0);
 }
 
+/*
+ * FIXME: this is a workaround to avoid nasty warning.  It will be removed
+ * after every device calls pci_disable_device in .resume.
+ */
+int acpi_in_resume;
 static int
 irqrouter_resume(
         struct sys_device *dev)
@@ -807,6 +812,7 @@ irqrouter_resume(
 
         ACPI_FUNCTION_TRACE("irqrouter_resume");
 
+        acpi_in_resume = 1;
         list_for_each(node, &acpi_link.entries) {
                 link = list_entry(node, struct acpi_pci_link, node);
                 if (!link) {
@@ -816,6 +822,7 @@ irqrouter_resume(
                 }
                 acpi_pci_link_resume(link);
         }
+        acpi_in_resume = 0;
         return_VALUE(0);
 }