From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 15 May 2015 20:47:28 +0000 (-0700)
Subject: 3.10-stable patches
X-Git-Tag: v3.10.79~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a323731da47651a8412b665586be2ef1904e020;p=thirdparty%2Fkernel%2Fstable-queue.git

3.10-stable patches

added patches:
	acpica-utilities-cleanup-to-enforce-acpi_physaddr_to_ptr-acpi_ptr_to_physaddr.patch
---

diff --git a/queue-3.10/acpica-utilities-cleanup-to-enforce-acpi_physaddr_to_ptr-acpi_ptr_to_physaddr.patch b/queue-3.10/acpica-utilities-cleanup-to-enforce-acpi_physaddr_to_ptr-acpi_ptr_to_physaddr.patch
new file mode 100644
index 00000000000..b5c0121ec15
--- /dev/null
+++ b/queue-3.10/acpica-utilities-cleanup-to-enforce-acpi_physaddr_to_ptr-acpi_ptr_to_physaddr.patch
@@ -0,0 +1,66 @@
+From 6d3fd3cc33d50e4c0d0c0bd172de02caaec3127c Mon Sep 17 00:00:00 2001
+From: Lv Zheng <lv.zheng@intel.com>
+Date: Mon, 13 Apr 2015 11:48:37 +0800
+Subject: ACPICA: Utilities: Cleanup to enforce ACPI_PHYSADDR_TO_PTR()/ACPI_PTR_TO_PHYSADDR().
+
+From: Lv Zheng <lv.zheng@intel.com>
+
+commit 6d3fd3cc33d50e4c0d0c0bd172de02caaec3127c upstream.
+
+ACPICA commit 154f6d074dd38d6ebc0467ad454454e6c5c9ecdf
+
+There are code pieces converting pointers using "(acpi_physical_address) x"
+or "ACPI_CAST_PTR (t, x)" formats, this patch cleans up them.
+
+Known issues:
+1. Cleanup of "(ACPI_PHYSICAL_ADDRRESS) x" for a table field
+   For the conversions around the table fields, it is better to fix it with
+   alignment also fixed. So this patch doesn't modify such code. There
+   should be no functional problem by leaving them unchanged.
+
+Link: https://github.com/acpica/acpica/commit/154f6d07
+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>
+Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
+Signed-off-by: George G. Davis <george_davis@mentor.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/acpi/acpica/dsopcode.c |    3 +--
+ drivers/acpi/acpica/tbinstal.c |    5 ++---
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+--- a/drivers/acpi/acpica/dsopcode.c
++++ b/drivers/acpi/acpica/dsopcode.c
+@@ -539,8 +539,7 @@ acpi_ds_eval_table_region_operands(struc
+ 		return_ACPI_STATUS(AE_NOT_EXIST);
+ 	}
+ 
+-	obj_desc->region.address =
+-	    (acpi_physical_address) ACPI_TO_INTEGER(table);
++	obj_desc->region.address = ACPI_PTR_TO_PHYSADDR(table);
+ 	obj_desc->region.length = table->length;
+ 
+ 	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "RgnObj %p Addr %8.8X%8.8X Len %X\n",
+--- a/drivers/acpi/acpica/tbinstal.c
++++ b/drivers/acpi/acpica/tbinstal.c
+@@ -301,8 +301,7 @@ struct acpi_table_header *acpi_tb_table_
+ 			ACPI_EXCEPTION((AE_INFO, AE_NO_MEMORY,
+ 					"%4.4s %p Attempted physical table override failed",
+ 					table_header->signature,
+-					ACPI_CAST_PTR(void,
+-						      table_desc->address)));
++					ACPI_PHYSADDR_TO_PTR(table_desc->address)));
+ 			return (NULL);
+ 		}
+ 
+@@ -318,7 +317,7 @@ struct acpi_table_header *acpi_tb_table_
+ 	ACPI_INFO((AE_INFO,
+ 		   "%4.4s %p %s table override, new table: %p",
+ 		   table_header->signature,
+-		   ACPI_CAST_PTR(void, table_desc->address),
++		   ACPI_PHYSADDR_TO_PTR(table_desc->address),
+ 		   override_type, new_table));
+ 
+ 	/* We can now unmap/delete the original table (if fully mapped) */
diff --git a/queue-3.10/series b/queue-3.10/series
index 00f40595b33..7a1911dd649 100644
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -14,3 +14,4 @@ mmc-card-don-t-access-rpmb-partitions-for-normal-read-write.patch
 sound-oss-fix-deadlock-in-sequencer_ioctl-sndctl_seq_outofband.patch
 revert-softirq-add-support-for-triggering-softirq-work-on-softirqs.patch
 acpica-tables-change-acpi_find_root_pointer-to-use-acpi_physical_address.patch
+acpica-utilities-cleanup-to-enforce-acpi_physaddr_to_ptr-acpi_ptr_to_physaddr.patch