[kernel] r22859 - in dists/jessie/linux/debian: . patches patches/debian

[Ben Hutchings]

Author: benh
Date: Sun Jul 26 15:33:49 2015
New Revision: 22859

Log:
Revert "ACPICA: Utilities: split IO address types from data type models." to avoid ABI change on i386

Added:
   dists/jessie/linux/debian/patches/debian/revert-acpica-utilities-split-io-address-types-from-.patch
Modified:
   dists/jessie/linux/debian/changelog
   dists/jessie/linux/debian/patches/series

Modified: dists/jessie/linux/debian/changelog
==============================================================================
--- dists/jessie/linux/debian/changelog	Sun Jul 26 13:40:53 2015	(r22858)
+++ dists/jessie/linux/debian/changelog	Sun Jul 26 15:33:49 2015	(r22859)
@@ -458,6 +458,8 @@
   * [x86] vmwgfx: Enable DRM_VMWGFX_FBCON (Closes: #714929)
   * [x86] edac: Add edac_ie31200 driver from Linux 3.17 (Closes: #780773)
   * [mips*] Correct FP ISA requirements (Closes: #781892)
+  * Revert "ACPICA: Utilities: split IO address types from data type models."
+    to avoid ABI change on i386
 
   [ Ian Campbell ]
   * [xen] xen-netback: return correct ethtool stats (Closes: #786936)

Added: dists/jessie/linux/debian/patches/debian/revert-acpica-utilities-split-io-address-types-from-.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/jessie/linux/debian/patches/debian/revert-acpica-utilities-split-io-address-types-from-.patch	Sun Jul 26 15:33:49 2015	(r22859)
@@ -0,0 +1,59 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 26 Jul 2015 14:51:24 +0100
+Subject: [PATCH] Revert "ACPICA: Utilities: split IO address types from data
+ type models."
+Forwarded: not-needed
+
+This reverts commit 2b8760100e1de69b6ff004c986328a82947db4ad, which
+changed the ABI for a huge number of symbols on i386.
+---
+ include/acpi/actypes.h        | 20 --------------------
+ include/acpi/platform/acenv.h |  1 -
+ 2 files changed, 21 deletions(-)
+
+diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
+index c2a41d2..73c2032 100644
+--- a/include/acpi/actypes.h
++++ b/include/acpi/actypes.h
+@@ -198,29 +198,9 @@ typedef int s32;
+ typedef s32 acpi_native_int;
+ 
+ typedef u32 acpi_size;
+-
+-#ifdef ACPI_32BIT_PHYSICAL_ADDRESS
+-
+-/*
+- * OSPMs can define this to shrink the size of the structures for 32-bit
+- * none PAE environment. ASL compiler may always define this to generate
+- * 32-bit OSPM compliant tables.
+- */
+ typedef u32 acpi_io_address;
+ typedef u32 acpi_physical_address;
+ 
+-#else				/* ACPI_32BIT_PHYSICAL_ADDRESS */
+-
+-/*
+- * It is reported that, after some calculations, the physical addresses can
+- * wrap over the 32-bit boundary on 32-bit PAE environment.
+- * https://bugzilla.kernel.org/show_bug.cgi?id=87971
+- */
+-typedef u64 acpi_io_address;
+-typedef u64 acpi_physical_address;
+-
+-#endif				/* ACPI_32BIT_PHYSICAL_ADDRESS */
+-
+ #define ACPI_MAX_PTR                    ACPI_UINT32_MAX
+ #define ACPI_SIZE_MAX                   ACPI_UINT32_MAX
+ 
+diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h
+index 3cedd43..c8f98b9 100644
+--- a/include/acpi/platform/acenv.h
++++ b/include/acpi/platform/acenv.h
+@@ -76,7 +76,6 @@
+ #define ACPI_LARGE_NAMESPACE_NODE
+ #define ACPI_DATA_TABLE_DISASSEMBLY
+ #define ACPI_SINGLE_THREADED
+-#define ACPI_32BIT_PHYSICAL_ADDRESS
+ #endif
+ 
+ /* acpi_exec configuration. Multithreaded with full AML debugger */

Modified: dists/jessie/linux/debian/patches/series
==============================================================================
--- dists/jessie/linux/debian/patches/series	Sun Jul 26 13:40:53 2015	(r22858)
+++ dists/jessie/linux/debian/patches/series	Sun Jul 26 15:33:49 2015	(r22859)
@@ -630,3 +630,4 @@
 debian/procfs-avoid-abi-change-in-3.16.7-ckt8.patch
 debian/revert-libata-ignore-spurious-phy-event-on-lpm-polic.patch
 debian/udp-fix-abi-change-in-3.16.7-ckt14.patch
+debian/revert-acpica-utilities-split-io-address-types-from-.patch