From: Len Brown <len.brown@intel.com>
Date: Fri, 30 Mar 2012 20:12:23 +0000 (-0400)
Subject: Merge branch 'apei' into release
X-Git-Tag: firefly_0821_release~3680^2~2945^2~2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=73f05330497b98c45d157b7d0c60673798bb4c3b;p=firefly-linux-kernel-4.4.55.git

Merge branch 'apei' into release

Conflicts:
	drivers/acpi/apei/apei-base.c

This was a conflict between

15afae604651d4e17652d2ffb56f5e36f991cfef
(CPI, APEI: Fix incorrect APEI register bit width check and usage)

and

653f4b538f66d37db560e0f56af08117136d29b7
(ACPICA: Expand OSL memory read/write interfaces to 64 bits)

The former changed a parameter in the call to acpi_os_read_memory64()
and the later replaced all calls to acpi_os_read_memory64()
with calls to acpi_os_read_memory().

Signed-off-by: Len Brown <len.brown@intel.com>
---

73f05330497b98c45d157b7d0c60673798bb4c3b
diff --cc drivers/acpi/apei/apei-base.c
index ca773683d87e,1d3656f6919f..5577762daee1
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@@ -605,8 -621,8 +621,8 @@@ int apei_read(u64 *val, struct acpi_gen
  	*val = 0;
  	switch(reg->space_id) {
  	case ACPI_ADR_SPACE_SYSTEM_MEMORY:
- 		status = acpi_os_read_memory((acpi_physical_address)
- 					     address, val, reg->bit_width);
 -		status = acpi_os_read_memory64((acpi_physical_address) address,
++		status = acpi_os_read_memory((acpi_physical_address) address,
+ 					       val, access_bit_width);
  		if (ACPI_FAILURE(status))
  			return -EIO;
  		break;
@@@ -636,8 -654,8 +654,8 @@@ int apei_write(u64 val, struct acpi_gen
  
  	switch (reg->space_id) {
  	case ACPI_ADR_SPACE_SYSTEM_MEMORY:
- 		status = acpi_os_write_memory((acpi_physical_address)
- 					      address, val, reg->bit_width);
 -		status = acpi_os_write_memory64((acpi_physical_address) address,
++		status = acpi_os_write_memory((acpi_physical_address) address,
+ 						val, access_bit_width);
  		if (ACPI_FAILURE(status))
  			return -EIO;
  		break;