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

Commit 5431b654 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Linuxize: reduce divergences for 20151218 release 



The patch reduces source code differences between the Linux kernel and the
ACPICA upstream so that the linuxized ACPICA 20151218 release can be
applied with reduced human intervention.

The pscode.c has already been out of sync for months, and it becomes more
and more difficult to merge pscode.c changes, so instead of update the
affected lines of pscode.c, this patch synchronizes entire pscode.c file.

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent b17629db

drivers/acpi/acpica/excreate.c

+2 −3
Original line number Diff line number Diff line
@@ -493,7 +493,6 @@ acpi_ex_create_method(u8 * aml_start, 
	 * flag, and sync_level for efficiency.

	 */

	method_flags = (u8)operand[1]->integer.value;



	obj_desc->method.param_count =

	    (u8)(method_flags & AML_METHOD_ARG_COUNT);

drivers/acpi/acpica/hwgpe.c

+1 −0
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ acpi_hw_gpe_enable_write(u8 enable_mask, 


	gpe_register_info->enable_mask = enable_mask;

	status = acpi_hw_write(enable_mask, &gpe_register_info->enable_address);



	return (status);

}

include/acpi/platform/aclinuxex.h

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ static inline acpi_status acpi_os_initialize_command_signals(void) 


static inline void acpi_os_terminate_command_signals(void)

{

	return;

}



/*

drivers/acpi/acpica/rsmisc.c

+3 −3

File changed.

Contains only whitespace changes.

drivers/acpi/acpica/exmutex.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/acpi/acpica/utobject.c

+2 −2

File changed.

Contains only whitespace changes.

drivers/acpi/acpica/dsfield.c

+4 −4

File changed.

Contains only whitespace changes.

drivers/acpi/acpica/dsutils.c

+2 −2

File changed.

Contains only whitespace changes.

drivers/acpi/acpica/exconvrt.c

+2 −2

File changed.

Contains only whitespace changes.

drivers/acpi/acpica/exfield.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/acpi/acpica/exoparg3.c

+3 −3

File changed.

Contains only whitespace changes.

drivers/acpi/acpica/nsrepair2.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/acpi/acpica/psopcode.c

+302 −302

File changed.

Contains only whitespace changes.