Commit 52c1d803 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Linuxize: Reduce divergences for 20150616 release 



This patch reduces source code differences between the Linux kernel and the
ACPICA upstream so that the linuxized ACPICA 20150616 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 f3b6ced2

drivers/acpi/acpica/hwxfsleep.c

+0 −2
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ acpi_status acpi_set_firmware_waking_vector64(u64 physical_address) 
{

	ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector64);





	/* Determine if the 64-bit vector actually exists */



	if ((acpi_gbl_FACS->length <= 32) || (acpi_gbl_FACS->version < 1)) {
@@ -154,7 +153,6 @@ acpi_status acpi_set_firmware_waking_vector64(u64 physical_address) 


ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector64)

#endif



/*******************************************************************************

 *

 * FUNCTION:    acpi_enter_sleep_state_s4bios

drivers/acpi/acpica/tbxface.c

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ acpi_get_table_header(char *signature, 
				if (!header) {

					return (AE_NO_MEMORY);

				}



				ACPI_MEMCPY(out_table_header, header,

					    sizeof(struct acpi_table_header));

				acpi_os_unmap_memory(header,

include/acpi/platform/acenv.h

+0 −1
Original line number Diff line number Diff line
@@ -359,7 +359,6 @@ 
#define ACPI_MEMCMP(s1,s2,n)    memcmp((const char *)(s1), (const char *)(s2), (acpi_size)(n))

#define ACPI_MEMCPY(d,s,n)      (void) memcpy((d), (s), (acpi_size)(n))

#define ACPI_MEMSET(d,s,n)      (void) memset((d), (s), (acpi_size)(n))



#define ACPI_TOUPPER(i)         toupper((int) (i))

#define ACPI_TOLOWER(i)         tolower((int) (i))

#define ACPI_IS_XDIGIT(i)       isxdigit((int) (i))

drivers/acpi/acpica/rscreate.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/acpi/acpica/rsutils.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/acpi/acpica/dsobject.c

+1 −1

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE