Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus (fd6f31c3) · Commits · e / devices / android_kernel_teracube_2e

drivers/acpi/dispatcher/dswload.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -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);
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -145,9 +145,13 @@ acpi_os_vprintf(const char *fmt, va_list args)
		#endif
		}

		extern int acpi_in_resume;
		void *
		acpi_os_allocate(acpi_size size)
		{
		if (acpi_in_resume)
		return kmalloc(size, GFP_ATOMIC);
		else
		return kmalloc(size, GFP_KERNEL);
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}