Patch "ACPICA: Tables: Change acpi_find_root_pointer() to use acpi_physical_address." has been added to the 3.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
ACPICA: Tables: Change acpi_find_root_pointer() to use acpi_physical_address.
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
acpica-tables-change-acpi_find_root_pointer-to-use-acpi_physical_address.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
f254e3c57b9d952e987502aefa0804c177dd2503Mon Sep 17 00:00:00 2001
From: Lv Zheng <[email protected]>
Date: Mon, 13 Apr 2015 11:48:18 +0800
Subject: ACPICA: Tables: Change acpi_find_root_pointer() to use acpi_physical_address.
From: Lv Zheng <[email protected]>
commit f254e3c57b9d952e987502aefa0804c177dd2503 upstream.
ACPICA commit 7d9fd64397d7c38899d3dc497525f6e6b044e0e3
OSPMs like Linux expect an acpi_physical_address returning value fromacpi_find_root_pointer(). This triggers warnings if sizeof (acpi_size) doesn't
equal to sizeof (acpi_physical_address):
drivers/acpi/osl.c:275:3: warning: passing argument 1 of 'acpi_find_root_pointer' from incompatible pointer type [enabled by default] In file included from include/acpi/acpi.h:64:0,
from include/linux/acpi.h:36,
from drivers/acpi/osl.c:41: include/acpi/acpixf.h:433:1: note: expected 'acpi_size *' but argument is of type 'acpi_physical_address *'
This patch corrects acpi_find_root_pointer().
--- drivers/acpi/acpica/tbxfroot.c | 7 ++++--- include/acpi/acpixf.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/acpi/acpica/tbxfroot.c +4 -3
@@ -111,7 +111,7 @@ acpi_status acpi_tb_validate_rsdp(struct* ******************************************************************************/ -acpi_status __init acpi_find_root_pointer (acpi_size *table_address) +acpi_status __init acpi_find_root_pointer (acpi_physical_address * table_address) {u8 *table_ptr;u8 *mem_rover;
@@ -169,7 +169,8 @@ acpi_status __init acpi_find_root_pointe physical_address += (u32 )ACPI_PTR_DIFF (mem_rover, table_ptr); - *table_address = physical_address; + *table_address = + (acpi_physical_address ) physical_address;return_ACPI_STATUS (AE_OK ); } }
@@ -202,7 +203,7 @@ acpi_status __init acpi_find_root_pointe (ACPI_HI_RSDP_WINDOW_BASE +ACPI_PTR_DIFF (mem_rover, table_ptr)); - *table_address = physical_address; + *table_address = (acpi_physical_address ) physical_address;return_ACPI_STATUS (AE_OK ); }
include/acpi/acpixf.h +1 -1
@@ -175,7 +175,7 @@ acpi_status __init acpi_load_tables(void*/ acpi_status __init acpi_reallocate_root_table (void ); -acpi_status __init acpi_find_root_pointer (acpi_size *rsdp_address); +acpi_status __init acpi_find_root_pointer (acpi_physical_address * rsdp_address);acpi_status acpi_unload_table_id (acpi_owner_id id);
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/acpica-tables-change-acpi_find_root_pointer-to-use-acpi_physical_address.patch