Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e19f8d0 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: Deploy new 32/64 printf support for table override mechanism. 



Similar to the earlier tbprint.c change.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c03775c0

drivers/acpi/acpica/tbinstal.c

+8 −7
Original line number Original line Diff line number Diff line
@@ -292,10 +292,11 @@ struct acpi_table_header *acpi_tb_table_override(struct acpi_table_header 
		new_table = acpi_os_map_memory(new_address, new_table_length);

		new_table = acpi_os_map_memory(new_address, new_table_length);

		if (!new_table) {

		if (!new_table) {

			ACPI_EXCEPTION((AE_INFO, AE_NO_MEMORY,

			ACPI_EXCEPTION((AE_INFO, AE_NO_MEMORY,

					"%4.4s %p Attempted physical table override failed",

					"%4.4s " ACPI_PRINTF_UINT

					" Attempted physical table override failed",

					table_header->signature,

					table_header->signature,

					ACPI_CAST_PTR(void,

					ACPI_FORMAT_TO_UINT(table_desc->

						      table_desc->address)));

							    address)));

			return (NULL);

			return (NULL);

		}

		}
@@ -308,11 +309,11 @@ struct acpi_table_header *acpi_tb_table_override(struct acpi_table_header 




finish_override:

finish_override:





	ACPI_INFO((AE_INFO,

	ACPI_INFO((AE_INFO, "%4.4s " ACPI_PRINTF_UINT

		   "%4.4s %p %s table override, new table: %p",

		   " %s table override, new table: " ACPI_PRINTF_UINT,

		   table_header->signature,

		   table_header->signature,

		   ACPI_CAST_PTR(void, table_desc->address),

		   ACPI_FORMAT_TO_UINT(table_desc->address),

		   override_type, new_table));

		   override_type, ACPI_FORMAT_TO_UINT(new_table)));





	/* We can now unmap/delete the original table (if fully mapped) */

	/* We can now unmap/delete the original table (if fully mapped) */