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

Commit 2368b1a1 authored Aug 04, 2016 by Lv Zheng Committed by Rafael J. Wysocki Aug 13, 2016

ACPICA: Divergence: Port declarators back to ACPICA

ACPICA commit c160cae765412f5736cf88a9ebcc6138aa761a48

Linux uses asmlinkage and sparse macros to mark function symbols.  This
leads to the divergences between the Linux and the ACPICA.
This patch ports such declarators back to ACPICA. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/c160cae7


Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 02dcdc3e

drivers/acpi/acpica/actables.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -159,7 +159,8 @@ acpi_status
	acpi_tb_install_fixed_table(acpi_physical_address address,		acpi_tb_install_fixed_table(acpi_physical_address address,
	char signature, u32 table_index);		char signature, u32 table_index);

	acpi_status acpi_tb_parse_root_table(acpi_physical_address rsdp_address);		acpi_status ACPI_INIT_FUNCTION
			acpi_tb_parse_root_table(acpi_physical_address rsdp_address);

	/*		/*
	* tbxfload		* tbxfload

drivers/acpi/acpica/tbutils.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -252,7 +252,8 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size)
	*		*
	******************************************************************************/		******************************************************************************/

	acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)		acpi_status ACPI_INIT_FUNCTION
			acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
	{		{
	struct acpi_table_rsdp *rsdp;		struct acpi_table_rsdp *rsdp;
	u32 table_entry_size;		u32 table_entry_size;

drivers/acpi/acpica/tbxface.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -98,7 +98,7 @@ acpi_status acpi_allocate_root_table(u32 initial_table_count)
	*		*
	******************************************************************************/		******************************************************************************/

	acpi_status __init		acpi_status ACPI_INIT_FUNCTION
	acpi_initialize_tables(struct acpi_table_desc *initial_table_array,		acpi_initialize_tables(struct acpi_table_desc *initial_table_array,
	u32 initial_table_count, u8 allow_resize)		u32 initial_table_count, u8 allow_resize)
	{		{
	@@ -164,7 +164,7 @@ ACPI_EXPORT_SYMBOL_INIT(acpi_initialize_tables)
	* kernel.		* kernel.
	*		*
	******************************************************************************/		******************************************************************************/
	acpi_status __init acpi_reallocate_root_table(void)		acpi_status ACPI_INIT_FUNCTION acpi_reallocate_root_table(void)
	{		{
	acpi_status status;		acpi_status status;

drivers/acpi/acpica/tbxfload.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,7 @@ ACPI_MODULE_NAME("tbxfload")
	* DESCRIPTION: Load the ACPI tables from the RSDT/XSDT		* DESCRIPTION: Load the ACPI tables from the RSDT/XSDT
	*		*
	******************************************************************************/		******************************************************************************/
	acpi_status __init acpi_load_tables(void)		acpi_status ACPI_INIT_FUNCTION acpi_load_tables(void)
	{		{
	acpi_status status;		acpi_status status;

	@@ -272,7 +272,7 @@ acpi_status acpi_tb_load_namespace(void)
	*		*
	******************************************************************************/		******************************************************************************/

	acpi_status __init		acpi_status ACPI_INIT_FUNCTION
	acpi_install_table(acpi_physical_address address, u8 physical)		acpi_install_table(acpi_physical_address address, u8 physical)
	{		{
	acpi_status status;		acpi_status status;

drivers/acpi/acpica/tbxfroot.c

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -142,7 +142,8 @@ acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp)
	*		*
	******************************************************************************/		******************************************************************************/

	acpi_status __init acpi_find_root_pointer(acpi_physical_address *table_address)		acpi_status ACPI_INIT_FUNCTION
			acpi_find_root_pointer(acpi_physical_address *table_address)
	{		{
	u8 *table_ptr;		u8 *table_ptr;
	u8 *mem_rover;		u8 *mem_rover;
	@@ -244,6 +245,8 @@ acpi_status __init acpi_find_root_pointer(acpi_physical_address *table_address)
	return_ACPI_STATUS(AE_NOT_FOUND);		return_ACPI_STATUS(AE_NOT_FOUND);
	}		}

			ACPI_EXPORT_SYMBOL_INIT(acpi_find_root_pointer)

	/*******************************************************************************		/*******************************************************************************
	*		*
	* FUNCTION: acpi_tb_scan_memory_for_rsdp		* FUNCTION: acpi_tb_scan_memory_for_rsdp