Commit 18ae9021 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki

ACPICA: Linuxize: Reduce divergences for 20150410 release.

This patch reduces source code differences between the Linux kernel and the
ACPICA upstream so that the linuxized ACPICA 20150410 release can be
applied with reduced human intervention.
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 39a88044
...@@ -303,7 +303,7 @@ acpi_rs_set_resource_length(acpi_rsdesc_size total_length, ...@@ -303,7 +303,7 @@ acpi_rs_set_resource_length(acpi_rsdesc_size total_length,
*/ */
void acpi_rs_dump_resource_list(struct acpi_resource *resource); void acpi_rs_dump_resource_list(struct acpi_resource *resource);
void acpi_rs_dump_irq_list(u8 * route_table); void acpi_rs_dump_irq_list(u8 *route_table);
/* /*
* Resource conversion tables * Resource conversion tables
......
...@@ -539,13 +539,11 @@ acpi_ut_create_update_state_and_push(union acpi_operand_object *object, ...@@ -539,13 +539,11 @@ acpi_ut_create_update_state_and_push(union acpi_operand_object *object,
u16 action, u16 action,
union acpi_generic_state **state_list); union acpi_generic_state **state_list);
#ifdef ACPI_FUTURE_USAGE
acpi_status acpi_status
acpi_ut_create_pkg_state_and_push(void *internal_object, acpi_ut_create_pkg_state_and_push(void *internal_object,
void *external_object, void *external_object,
u16 index, u16 index,
union acpi_generic_state **state_list); union acpi_generic_state **state_list);
#endif /* ACPI_FUTURE_USAGE */
union acpi_generic_state *acpi_ut_create_control_state(void); union acpi_generic_state *acpi_ut_create_control_state(void);
......
...@@ -182,7 +182,7 @@ acpi_ex_system_memory_space_handler(u32 function, ...@@ -182,7 +182,7 @@ acpi_ex_system_memory_space_handler(u32 function,
ACPI_ERROR((AE_INFO, ACPI_ERROR((AE_INFO,
"Could not map memory at 0x%8.8X%8.8X, size %u", "Could not map memory at 0x%8.8X%8.8X, size %u",
ACPI_FORMAT_NATIVE_UINT(address), ACPI_FORMAT_NATIVE_UINT(address),
(u32) map_length)); (u32)map_length));
mem_info->mapped_length = 0; mem_info->mapped_length = 0;
return_ACPI_STATUS(AE_NO_MEMORY); return_ACPI_STATUS(AE_NO_MEMORY);
} }
......
...@@ -438,7 +438,7 @@ void acpi_rs_dump_resource_list(struct acpi_resource *resource_list) ...@@ -438,7 +438,7 @@ void acpi_rs_dump_resource_list(struct acpi_resource *resource_list)
* *
******************************************************************************/ ******************************************************************************/
void acpi_rs_dump_irq_list(u8 * route_table) void acpi_rs_dump_irq_list(u8 *route_table)
{ {
struct acpi_pci_routing_table *prt_element; struct acpi_pci_routing_table *prt_element;
u8 count; u8 count;
......
...@@ -142,7 +142,7 @@ acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp * rsdp) ...@@ -142,7 +142,7 @@ acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp * rsdp)
* *
******************************************************************************/ ******************************************************************************/
acpi_status __init acpi_find_root_pointer(acpi_size *table_address) acpi_status __init acpi_find_root_pointer(acpi_size * table_address)
{ {
u8 *table_ptr; u8 *table_ptr;
u8 *mem_rover; u8 *mem_rover;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment