Commit 084f8430 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' 

Merge a fix updating the _CPC object definition in ACPICA to avoid
printing a false-positive output package format warning on new
platforms (Saket Dumbre)

* acpica:
  ACPICA: Update the _CPC definition to match ACPI 6.6
parents 00fd9aad 800ca7b8

drivers/acpi/acpica/acpredef.h

+3 −2
Original line number Diff line number Diff line
@@ -379,8 +379,9 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = { 


	{{"_CPC", METHOD_0ARGS,

	  METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}},	/* Variable-length (Ints/Bufs) */

	PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER, 0,

		     0, 0, 0),

	PACKAGE_INFO(ACPI_PTYPE1_VAR,

		     ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER |

		     ACPI_RTYPE_PACKAGE, 0, 0, 0, 0),



	{{"_CR3", METHOD_0ARGS,	/* ACPI 6.0 */

	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},