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

Merge branches 'acpi-tables' and 'acpica' 

Merge ACPICA regression fix and a fix for the recently added PPTT
support.

* acpi-tables:
  ACPI / PPTT: use ACPI ID whenever ACPI_PPTT_ACPI_PROCESSOR_ID_VALID is set

* acpica:
  ACPICA: Drop leading newlines from error messages
parents 673b4271 30998033 a0d5f3b6

drivers/acpi/acpica/uterror.c

+3 −3
Original line number Diff line number Diff line
@@ -182,19 +182,19 @@ acpi_ut_prefixed_namespace_error(const char *module_name, 
	switch (lookup_status) {

	case AE_ALREADY_EXISTS:



		acpi_os_printf("\n" ACPI_MSG_BIOS_ERROR);

		acpi_os_printf(ACPI_MSG_BIOS_ERROR);

		message = "Failure creating";

		break;



	case AE_NOT_FOUND:



		acpi_os_printf("\n" ACPI_MSG_BIOS_ERROR);

		acpi_os_printf(ACPI_MSG_BIOS_ERROR);

		message = "Could not resolve";

		break;



	default:



		acpi_os_printf("\n" ACPI_MSG_ERROR);

		acpi_os_printf(ACPI_MSG_ERROR);

		message = "Failure resolving";

		break;

	}

drivers/acpi/pptt.c

+8 −2
Original line number Diff line number Diff line
@@ -481,8 +481,14 @@ static int topology_get_acpi_cpu_tag(struct acpi_table_header *table, 
	if (cpu_node) {

		cpu_node = acpi_find_processor_package_id(table, cpu_node,

							  level, flag);

		/* Only the first level has a guaranteed id */

		if (level == 0)

		/*

		 * As per specification if the processor structure represents

		 * an actual processor, then ACPI processor ID must be valid.

		 * For processor containers ACPI_PPTT_ACPI_PROCESSOR_ID_VALID

		 * should be set if the UID is valid

		 */

		if (level == 0 ||

		    cpu_node->flags & ACPI_PPTT_ACPI_PROCESSOR_ID_VALID)

			return cpu_node->acpi_processor_id;

		return ACPI_PTR_DIFF(cpu_node, table);

	}