Update source to 20170119 version from upstream

Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2017-01-27 13:14:27 -07:00
parent 60e695f8bf
commit 461b6bd9e3
5 changed files with 140 additions and 134 deletions

2
.gitignore vendored
View File

@ -62,3 +62,5 @@
/acpitests-unix-20161117.tar.gz /acpitests-unix-20161117.tar.gz
/acpica-unix2-20161222.tar.gz /acpica-unix2-20161222.tar.gz
/acpitests-unix-20161222.tar.gz /acpitests-unix-20161222.tar.gz
/acpica-unix2-20170119.tar.gz
/acpitests-unix-20170119.tar.gz

View File

@ -1,5 +1,5 @@
Name: acpica-tools Name: acpica-tools
Version: 20161222 Version: 20170119
Release: 1%{?dist} Release: 1%{?dist}
Summary: ACPICA tools for the development and debug of ACPI tables Summary: ACPICA tools for the development and debug of ACPI tables
@ -190,6 +190,10 @@ fi
%changelog %changelog
* Fri Jan 27 2017 Al Stone <ahs3@redhat.com> - 20170119-1
- Update to latest upstream. Closes BZ#1381017.
- Refresh patches.
* Mon Jan 9 2017 Al Stone <ahs3@redhat.com> - 20161222-1 * Mon Jan 9 2017 Al Stone <ahs3@redhat.com> - 20161222-1
- Update to latest upstream. Closes BZ#1381017. - Update to latest upstream. Closes BZ#1381017.
- Refresh patches. - Refresh patches.

View File

@ -18,10 +18,10 @@ support
source/include/platform/aclinux.h | 8 ++ source/include/platform/aclinux.h | 8 ++
12 files changed, 487 insertions(+), 283 deletions(-) 12 files changed, 487 insertions(+), 283 deletions(-)
Index: acpica-unix2-20161222/source/compiler/aslcodegen.c Index: acpica-unix2-20170119/source/compiler/aslcodegen.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/compiler/aslcodegen.c --- acpica-unix2-20170119.orig/source/compiler/aslcodegen.c
+++ acpica-unix2-20161222/source/compiler/aslcodegen.c +++ acpica-unix2-20170119/source/compiler/aslcodegen.c
@@ -243,16 +243,12 @@ CgWriteAmlOpcode ( @@ -243,16 +243,12 @@ CgWriteAmlOpcode (
ACPI_PARSE_OBJECT *Op) ACPI_PARSE_OBJECT *Op)
{ {
@ -263,10 +263,10 @@ Index: acpica-unix2-20161222/source/compiler/aslcodegen.c
case AML_RAW_DATA_BUFFER: case AML_RAW_DATA_BUFFER:
Index: acpica-unix2-20161222/source/compiler/aslopcodes.c Index: acpica-unix2-20170119/source/compiler/aslopcodes.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/compiler/aslopcodes.c --- acpica-unix2-20170119.orig/source/compiler/aslopcodes.c
+++ acpica-unix2-20161222/source/compiler/aslopcodes.c +++ acpica-unix2-20170119/source/compiler/aslopcodes.c
@@ -485,6 +485,7 @@ OpcDoUnicode ( @@ -485,6 +485,7 @@ OpcDoUnicode (
UINT32 i; UINT32 i;
UINT8 *AsciiString; UINT8 *AsciiString;
@ -285,10 +285,10 @@ Index: acpica-unix2-20161222/source/compiler/aslopcodes.c
} }
/* /*
Index: acpica-unix2-20161222/source/compiler/aslrestype1.c Index: acpica-unix2-20170119/source/compiler/aslrestype1.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/compiler/aslrestype1.c --- acpica-unix2-20170119.orig/source/compiler/aslrestype1.c
+++ acpica-unix2-20161222/source/compiler/aslrestype1.c +++ acpica-unix2-20170119/source/compiler/aslrestype1.c
@@ -142,6 +142,11 @@ RsDoMemory24Descriptor ( @@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
ACPI_PARSE_OBJECT *LengthOp = NULL; ACPI_PARSE_OBJECT *LengthOp = NULL;
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -485,10 +485,10 @@ Index: acpica-unix2-20161222/source/compiler/aslrestype1.c
RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength)); CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
break; break;
Index: acpica-unix2-20161222/source/compiler/aslrestype1i.c Index: acpica-unix2-20170119/source/compiler/aslrestype1i.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/compiler/aslrestype1i.c --- acpica-unix2-20170119.orig/source/compiler/aslrestype1i.c
+++ acpica-unix2-20161222/source/compiler/aslrestype1i.c +++ acpica-unix2-20170119/source/compiler/aslrestype1i.c
@@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor ( @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
ACPI_PARSE_OBJECT *InitializerOp; ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -625,10 +625,10 @@ Index: acpica-unix2-20161222/source/compiler/aslrestype1i.c
+ ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask); + ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
return (Rnode); return (Rnode);
} }
Index: acpica-unix2-20161222/source/compiler/aslrestype2.c Index: acpica-unix2-20170119/source/compiler/aslrestype2.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/compiler/aslrestype2.c --- acpica-unix2-20170119.orig/source/compiler/aslrestype2.c
+++ acpica-unix2-20161222/source/compiler/aslrestype2.c +++ acpica-unix2-20170119/source/compiler/aslrestype2.c
@@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor ( @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
ACPI_PARSE_OBJECT *InitializerOp; ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -725,10 +725,10 @@ Index: acpica-unix2-20161222/source/compiler/aslrestype2.c
/* Point to end-of-descriptor for vendor data */ /* Point to end-of-descriptor for vendor data */
Index: acpica-unix2-20161222/source/compiler/aslrestype2d.c Index: acpica-unix2-20170119/source/compiler/aslrestype2d.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/compiler/aslrestype2d.c --- acpica-unix2-20170119.orig/source/compiler/aslrestype2d.c
+++ acpica-unix2-20161222/source/compiler/aslrestype2d.c +++ acpica-unix2-20170119/source/compiler/aslrestype2d.c
@@ -79,7 +79,13 @@ RsDoDwordIoDescriptor ( @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL; ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -1084,10 +1084,10 @@ Index: acpica-unix2-20161222/source/compiler/aslrestype2d.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
OptionIndex + StringLength; OptionIndex + StringLength;
return (Rnode); return (Rnode);
Index: acpica-unix2-20161222/source/compiler/aslrestype2e.c Index: acpica-unix2-20170119/source/compiler/aslrestype2e.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/compiler/aslrestype2e.c --- acpica-unix2-20170119.orig/source/compiler/aslrestype2e.c
+++ acpica-unix2-20161222/source/compiler/aslrestype2e.c +++ acpica-unix2-20170119/source/compiler/aslrestype2e.c
@@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor ( @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL; ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -1193,10 +1193,10 @@ Index: acpica-unix2-20161222/source/compiler/aslrestype2e.c
Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
StringLength; StringLength;
return (Rnode); return (Rnode);
Index: acpica-unix2-20161222/source/compiler/aslrestype2q.c Index: acpica-unix2-20170119/source/compiler/aslrestype2q.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/compiler/aslrestype2q.c --- acpica-unix2-20170119.orig/source/compiler/aslrestype2q.c
+++ acpica-unix2-20161222/source/compiler/aslrestype2q.c +++ acpica-unix2-20170119/source/compiler/aslrestype2q.c
@@ -80,7 +80,13 @@ RsDoQwordIoDescriptor ( @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
UINT8 *OptionalFields; UINT8 *OptionalFields;
@ -1535,10 +1535,10 @@ Index: acpica-unix2-20161222/source/compiler/aslrestype2q.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
OptionIndex + StringLength; OptionIndex + StringLength;
return (Rnode); return (Rnode);
Index: acpica-unix2-20161222/source/compiler/aslrestype2s.c Index: acpica-unix2-20170119/source/compiler/aslrestype2s.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/compiler/aslrestype2s.c --- acpica-unix2-20170119.orig/source/compiler/aslrestype2s.c
+++ acpica-unix2-20161222/source/compiler/aslrestype2s.c +++ acpica-unix2-20170119/source/compiler/aslrestype2s.c
@@ -290,6 +290,9 @@ RsDoGpioIntDescriptor ( @@ -290,6 +290,9 @@ RsDoGpioIntDescriptor (
UINT16 VendorLength; UINT16 VendorLength;
UINT16 InterruptLength; UINT16 InterruptLength;
@ -1852,10 +1852,10 @@ Index: acpica-unix2-20161222/source/compiler/aslrestype2s.c
MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
return (Rnode); return (Rnode);
} }
Index: acpica-unix2-20161222/source/compiler/aslrestype2w.c Index: acpica-unix2-20170119/source/compiler/aslrestype2w.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/compiler/aslrestype2w.c --- acpica-unix2-20170119.orig/source/compiler/aslrestype2w.c
+++ acpica-unix2-20161222/source/compiler/aslrestype2w.c +++ acpica-unix2-20170119/source/compiler/aslrestype2w.c
@@ -81,6 +81,12 @@ RsDoWordIoDescriptor ( @@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
UINT8 *OptionalFields; UINT8 *OptionalFields;
UINT16 StringLength = 0; UINT16 StringLength = 0;
@ -2199,10 +2199,10 @@ Index: acpica-unix2-20161222/source/compiler/aslrestype2w.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
OptionIndex + StringLength; OptionIndex + StringLength;
return (Rnode); return (Rnode);
Index: acpica-unix2-20161222/source/include/acmacros.h Index: acpica-unix2-20170119/source/include/acmacros.h
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/include/acmacros.h --- acpica-unix2-20170119.orig/source/include/acmacros.h
+++ acpica-unix2-20161222/source/include/acmacros.h +++ acpica-unix2-20170119/source/include/acmacros.h
@@ -100,7 +100,8 @@ @@ -100,7 +100,8 @@
/* 32-bit source, 16/32/64 destination */ /* 32-bit source, 16/32/64 destination */
@ -2240,11 +2240,11 @@ Index: acpica-unix2-20161222/source/include/acmacros.h
#define ACPI_MOVE_32_TO_32(d, s) *(UINT32 *)(void *)(d) = *(UINT32 *)(void *)(s) #define ACPI_MOVE_32_TO_32(d, s) *(UINT32 *)(void *)(d) = *(UINT32 *)(void *)(s)
#define ACPI_MOVE_32_TO_64(d, s) *(UINT64 *)(void *)(d) = *(UINT32 *)(void *)(s) #define ACPI_MOVE_32_TO_64(d, s) *(UINT64 *)(void *)(d) = *(UINT32 *)(void *)(s)
Index: acpica-unix2-20161222/source/include/platform/aclinux.h Index: acpica-unix2-20170119/source/include/platform/aclinux.h
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/include/platform/aclinux.h --- acpica-unix2-20170119.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20161222/source/include/platform/aclinux.h +++ acpica-unix2-20170119/source/include/platform/aclinux.h
@@ -181,6 +181,7 @@ @@ -185,6 +185,7 @@
#ifdef ACPI_USE_STANDARD_HEADERS #ifdef ACPI_USE_STANDARD_HEADERS
#include <unistd.h> #include <unistd.h>

View File

@ -1,2 +1,2 @@
SHA512 (acpica-unix2-20161222.tar.gz) = 3e116ea2c559bd9343ac9ccfac632626f42e7598c1cc95a4b906e28ceebb81a4a22cbcda61f1e0b354dd002978c1286a2cac4f9cacef3d8f255b816db0b179a0 SHA512 (acpica-unix2-20170119.tar.gz) = 0b4b471e41c8aa157683dc6685d561aee8837afd21e3f6733f2ea7c98a9eda459c01aa6570d6f89b893f37bc568805c66c051cb1a29dafb9ed012d48e96f5660
SHA512 (acpitests-unix-20161222.tar.gz) = ff0435f40564a94ceb3bc6cfc11ac859a5467b650004238092d7f3e2f7d596e7eb2fb9d3c56f0860c8324d38fcbedf3c6f4bc3f0569f1148462b824c7c025408 SHA512 (acpitests-unix-20170119.tar.gz) = 38b8c4de1afb50bb75f1ed38109b35d44fe8ed312caa412f955c51534d9f64e0828d815a7af44423f59ea54950c9d2ad9687c2cef473aac53679f5894b978155

View File

@ -1,7 +1,7 @@
Index: acpica-unix2-20161222/source/common/acfileio.c Index: acpica-unix2-20170119/source/common/acfileio.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/common/acfileio.c --- acpica-unix2-20170119.orig/source/common/acfileio.c
+++ acpica-unix2-20161222/source/common/acfileio.c +++ acpica-unix2-20170119/source/common/acfileio.c
@@ -250,6 +250,7 @@ AcGetOneTableFromFile ( @@ -250,6 +250,7 @@ AcGetOneTableFromFile (
ACPI_TABLE_HEADER *Table; ACPI_TABLE_HEADER *Table;
INT32 Count; INT32 Count;
@ -63,10 +63,10 @@ Index: acpica-unix2-20161222/source/common/acfileio.c
(UINT32) (FileSize - TableOffset)); (UINT32) (FileSize - TableOffset));
return (AE_BAD_HEADER); return (AE_BAD_HEADER);
} }
Index: acpica-unix2-20161222/source/common/ahpredef.c Index: acpica-unix2-20170119/source/common/ahpredef.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/common/ahpredef.c --- acpica-unix2-20170119.orig/source/common/ahpredef.c
+++ acpica-unix2-20161222/source/common/ahpredef.c +++ acpica-unix2-20170119/source/common/ahpredef.c
@@ -358,7 +358,7 @@ AcpiAhMatchPredefinedName ( @@ -358,7 +358,7 @@ AcpiAhMatchPredefinedName (
char *Nameseg) char *Nameseg)
{ {
@ -76,10 +76,10 @@ Index: acpica-unix2-20161222/source/common/ahpredef.c
for (Info = AslPredefinedInfo; Info->Name; Info++) for (Info = AslPredefinedInfo; Info->Name; Info++)
{ {
Index: acpica-unix2-20161222/source/common/dmtable.c Index: acpica-unix2-20170119/source/common/dmtable.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/common/dmtable.c --- acpica-unix2-20170119.orig/source/common/dmtable.c
+++ acpica-unix2-20161222/source/common/dmtable.c +++ acpica-unix2-20170119/source/common/dmtable.c
@@ -499,7 +499,7 @@ AcpiDmDumpDataTable ( @@ -499,7 +499,7 @@ AcpiDmDumpDataTable (
*/ */
if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS)) if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS))
@ -178,10 +178,10 @@ Index: acpica-unix2-20161222/source/common/dmtable.c
AcpiDmNfitSubnames[Temp16]); AcpiDmNfitSubnames[Temp16]);
break; break;
Index: acpica-unix2-20161222/source/common/dmtables.c Index: acpica-unix2-20170119/source/common/dmtables.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/common/dmtables.c --- acpica-unix2-20170119.orig/source/common/dmtables.c
+++ acpica-unix2-20161222/source/common/dmtables.c +++ acpica-unix2-20170119/source/common/dmtables.c
@@ -140,7 +140,9 @@ AdCreateTableHeader ( @@ -140,7 +140,9 @@ AdCreateTableHeader (
ACPI_TABLE_HEADER *Table) ACPI_TABLE_HEADER *Table)
{ {
@ -247,10 +247,10 @@ Index: acpica-unix2-20161222/source/common/dmtables.c
AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)); AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
/* Create the root object */ /* Create the root object */
Index: acpica-unix2-20161222/source/common/dmtbdump.c Index: acpica-unix2-20170119/source/common/dmtbdump.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/common/dmtbdump.c --- acpica-unix2-20170119.orig/source/common/dmtbdump.c
+++ acpica-unix2-20161222/source/common/dmtbdump.c +++ acpica-unix2-20170119/source/common/dmtbdump.c
@@ -277,6 +277,8 @@ AcpiDmDumpRsdt ( @@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
UINT32 Entries; UINT32 Entries;
UINT32 Offset; UINT32 Offset;
@ -2064,10 +2064,10 @@ Index: acpica-unix2-20161222/source/common/dmtbdump.c
+ (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength, + (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
AcpiDmTableInfoWpbt0); AcpiDmTableInfoWpbt0);
} }
Index: acpica-unix2-20161222/source/compiler/aslrestype2.c Index: acpica-unix2-20170119/source/compiler/aslrestype2.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/compiler/aslrestype2.c --- acpica-unix2-20170119.orig/source/compiler/aslrestype2.c
+++ acpica-unix2-20161222/source/compiler/aslrestype2.c +++ acpica-unix2-20170119/source/compiler/aslrestype2.c
@@ -98,21 +98,33 @@ RsDoGeneralRegisterDescriptor ( @@ -98,21 +98,33 @@ RsDoGeneralRegisterDescriptor (
{ {
case 0: /* Address space */ case 0: /* Address space */
@ -2114,10 +2114,10 @@ Index: acpica-unix2-20161222/source/compiler/aslrestype2.c
RsCreateByteField (InitializerOp, ACPI_RESTAG_ACCESSSIZE, RsCreateByteField (InitializerOp, ACPI_RESTAG_ACCESSSIZE,
CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.AccessSize)); CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.AccessSize));
Index: acpica-unix2-20161222/source/compiler/dtfield.c Index: acpica-unix2-20170119/source/compiler/dtfield.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/compiler/dtfield.c --- acpica-unix2-20170119.orig/source/compiler/dtfield.c
+++ acpica-unix2-20161222/source/compiler/dtfield.c +++ acpica-unix2-20170119/source/compiler/dtfield.c
@@ -360,7 +360,27 @@ DtCompileInteger ( @@ -360,7 +360,27 @@ DtCompileInteger (
DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, MsgBuffer); DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, MsgBuffer);
} }
@ -2147,10 +2147,10 @@ Index: acpica-unix2-20161222/source/compiler/dtfield.c
return; return;
} }
Index: acpica-unix2-20161222/source/compiler/dtsubtable.c Index: acpica-unix2-20170119/source/compiler/dtsubtable.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/compiler/dtsubtable.c --- acpica-unix2-20170119.orig/source/compiler/dtsubtable.c
+++ acpica-unix2-20161222/source/compiler/dtsubtable.c +++ acpica-unix2-20170119/source/compiler/dtsubtable.c
@@ -379,6 +379,21 @@ DtSetSubtableLength ( @@ -379,6 +379,21 @@ DtSetSubtableLength (
return; return;
} }
@ -2175,10 +2175,10 @@ Index: acpica-unix2-20161222/source/compiler/dtsubtable.c
+ Subtable->SizeOfLengthField); + Subtable->SizeOfLengthField);
+ } + }
} }
Index: acpica-unix2-20161222/source/compiler/dttable1.c Index: acpica-unix2-20170119/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/compiler/dttable1.c --- acpica-unix2-20170119.orig/source/compiler/dttable1.c
+++ acpica-unix2-20161222/source/compiler/dttable1.c +++ acpica-unix2-20170119/source/compiler/dttable1.c
@@ -282,6 +282,8 @@ DtCompileCsrt ( @@ -282,6 +282,8 @@ DtCompileCsrt (
DT_FIELD **PFieldList = (DT_FIELD **) List; DT_FIELD **PFieldList = (DT_FIELD **) List;
UINT32 DescriptorCount; UINT32 DescriptorCount;
@ -2552,10 +2552,10 @@ Index: acpica-unix2-20161222/source/compiler/dttable1.c
return (AE_OK); return (AE_OK);
} }
Index: acpica-unix2-20161222/source/compiler/dttable2.c Index: acpica-unix2-20170119/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/compiler/dttable2.c --- acpica-unix2-20170119.orig/source/compiler/dttable2.c
+++ acpica-unix2-20161222/source/compiler/dttable2.c +++ acpica-unix2-20170119/source/compiler/dttable2.c
@@ -346,7 +346,7 @@ DtCompileMpst ( @@ -346,7 +346,7 @@ DtCompileMpst (
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
@ -2712,10 +2712,10 @@ Index: acpica-unix2-20161222/source/compiler/dttable2.c
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
Index: acpica-unix2-20161222/source/components/disassembler/dmbuffer.c Index: acpica-unix2-20170119/source/components/disassembler/dmbuffer.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/disassembler/dmbuffer.c --- acpica-unix2-20170119.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix2-20161222/source/components/disassembler/dmbuffer.c +++ acpica-unix2-20170119/source/components/disassembler/dmbuffer.c
@@ -204,7 +204,7 @@ AcpiDmByteList ( @@ -204,7 +204,7 @@ AcpiDmByteList (
@ -2791,10 +2791,10 @@ Index: acpica-unix2-20161222/source/components/disassembler/dmbuffer.c
NextOp = AcpiPsGetDepthNext (NULL, Op); NextOp = AcpiPsGetDepthNext (NULL, Op);
if (!NextOp) if (!NextOp)
Index: acpica-unix2-20161222/source/components/disassembler/dmopcode.c Index: acpica-unix2-20170119/source/components/disassembler/dmopcode.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/disassembler/dmopcode.c --- acpica-unix2-20170119.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix2-20161222/source/components/disassembler/dmopcode.c +++ acpica-unix2-20170119/source/components/disassembler/dmopcode.c
@@ -251,6 +251,7 @@ AcpiDmPredefinedDescription ( @@ -251,6 +251,7 @@ AcpiDmPredefinedDescription (
char *NameString; char *NameString;
int LastCharIsDigit; int LastCharIsDigit;
@ -2846,10 +2846,10 @@ Index: acpica-unix2-20161222/source/components/disassembler/dmopcode.c
Info->BitOffset += Offset; Info->BitOffset += Offset;
if (Info->BitOffset % 8 == 0) if (Info->BitOffset % 8 == 0)
Index: acpica-unix2-20161222/source/components/disassembler/dmresrcl2.c Index: acpica-unix2-20170119/source/components/disassembler/dmresrcl2.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/disassembler/dmresrcl2.c --- acpica-unix2-20170119.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix2-20161222/source/components/disassembler/dmresrcl2.c +++ acpica-unix2-20170119/source/components/disassembler/dmresrcl2.c
@@ -191,22 +191,24 @@ AcpiDmGpioCommon ( @@ -191,22 +191,24 @@ AcpiDmGpioCommon (
char *DeviceName = NULL; char *DeviceName = NULL;
UINT32 PinCount; UINT32 PinCount;
@ -3071,10 +3071,10 @@ Index: acpica-unix2-20161222/source/components/disassembler/dmresrcl2.c
DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset); DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX); AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
Index: acpica-unix2-20161222/source/components/disassembler/dmresrcl.c Index: acpica-unix2-20170119/source/components/disassembler/dmresrcl.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/disassembler/dmresrcl.c --- acpica-unix2-20170119.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix2-20161222/source/components/disassembler/dmresrcl.c +++ acpica-unix2-20170119/source/components/disassembler/dmresrcl.c
@@ -141,7 +141,8 @@ AcpiDmMemoryFields ( @@ -141,7 +141,8 @@ AcpiDmMemoryFields (
UINT32 Level) UINT32 Level)
{ {
@ -3223,10 +3223,10 @@ Index: acpica-unix2-20161222/source/components/disassembler/dmresrcl.c
} }
AcpiDmIndent (Level); AcpiDmIndent (Level);
Index: acpica-unix2-20161222/source/components/disassembler/dmresrcs.c Index: acpica-unix2-20170119/source/components/disassembler/dmresrcs.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/disassembler/dmresrcs.c --- acpica-unix2-20170119.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix2-20161222/source/components/disassembler/dmresrcs.c +++ acpica-unix2-20170119/source/components/disassembler/dmresrcs.c
@@ -72,6 +72,7 @@ AcpiDmIrqDescriptor ( @@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
UINT32 Length, UINT32 Length,
UINT32 Level) UINT32 Level)
@ -3283,10 +3283,10 @@ Index: acpica-unix2-20161222/source/components/disassembler/dmresrcs.c
AcpiDmIndent (Level + 1); AcpiDmIndent (Level + 1);
AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length"); AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
Index: acpica-unix2-20161222/source/components/dispatcher/dsfield.c Index: acpica-unix2-20170119/source/components/dispatcher/dsfield.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/dispatcher/dsfield.c --- acpica-unix2-20170119.orig/source/components/dispatcher/dsfield.c
+++ acpica-unix2-20161222/source/components/dispatcher/dsfield.c +++ acpica-unix2-20170119/source/components/dispatcher/dsfield.c
@@ -318,6 +318,7 @@ AcpiDsGetFieldNames ( @@ -318,6 +318,7 @@ AcpiDsGetFieldNames (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT64 Position; UINT64 Position;
@ -3331,10 +3331,10 @@ Index: acpica-unix2-20161222/source/components/dispatcher/dsfield.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
ACPI_ERROR_NAMESPACE ((char *) &Arg->Named.Name, Status); ACPI_ERROR_NAMESPACE ((char *) &Arg->Named.Name, Status);
Index: acpica-unix2-20161222/source/components/events/evgpeblk.c Index: acpica-unix2-20170119/source/components/events/evgpeblk.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/events/evgpeblk.c --- acpica-unix2-20170119.orig/source/components/events/evgpeblk.c
+++ acpica-unix2-20161222/source/components/events/evgpeblk.c +++ acpica-unix2-20170119/source/components/events/evgpeblk.c
@@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock ( @@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock (
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_GPE_BLOCK_INFO *GpeBlock; ACPI_GPE_BLOCK_INFO *GpeBlock;
@ -3367,10 +3367,10 @@ Index: acpica-unix2-20161222/source/components/events/evgpeblk.c
InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : "")); InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
/* Update global count of currently available GPEs */ /* Update global count of currently available GPEs */
Index: acpica-unix2-20161222/source/components/hardware/hwregs.c Index: acpica-unix2-20170119/source/components/hardware/hwregs.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/hardware/hwregs.c --- acpica-unix2-20170119.orig/source/components/hardware/hwregs.c
+++ acpica-unix2-20161222/source/components/hardware/hwregs.c +++ acpica-unix2-20170119/source/components/hardware/hwregs.c
@@ -197,7 +197,7 @@ AcpiHwValidateRegister ( @@ -197,7 +197,7 @@ AcpiHwValidateRegister (
* Address must not be null. A null address also indicates an optional * Address must not be null. A null address also indicates an optional
* ACPI register that is not supported, so no error message. * ACPI register that is not supported, so no error message.
@ -3380,10 +3380,10 @@ Index: acpica-unix2-20161222/source/components/hardware/hwregs.c
if (!(*Address)) if (!(*Address))
{ {
return (AE_BAD_ADDRESS); return (AE_BAD_ADDRESS);
Index: acpica-unix2-20161222/source/components/hardware/hwvalid.c Index: acpica-unix2-20170119/source/components/hardware/hwvalid.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/hardware/hwvalid.c --- acpica-unix2-20170119.orig/source/components/hardware/hwvalid.c
+++ acpica-unix2-20161222/source/components/hardware/hwvalid.c +++ acpica-unix2-20170119/source/components/hardware/hwvalid.c
@@ -135,6 +135,8 @@ AcpiHwValidateIoRequest ( @@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
UINT32 ByteWidth; UINT32 ByteWidth;
ACPI_IO_ADDRESS LastAddress; ACPI_IO_ADDRESS LastAddress;
@ -3405,10 +3405,10 @@ Index: acpica-unix2-20161222/source/components/hardware/hwvalid.c
{ {
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
"Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X", "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X",
Index: acpica-unix2-20161222/source/components/namespace/nsaccess.c Index: acpica-unix2-20170119/source/components/namespace/nsaccess.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/namespace/nsaccess.c --- acpica-unix2-20170119.orig/source/components/namespace/nsaccess.c
+++ acpica-unix2-20161222/source/components/namespace/nsaccess.c +++ acpica-unix2-20170119/source/components/namespace/nsaccess.c
@@ -309,6 +309,7 @@ AcpiNsLookup ( @@ -309,6 +309,7 @@ AcpiNsLookup (
ACPI_OBJECT_TYPE ThisSearchType; ACPI_OBJECT_TYPE ThisSearchType;
UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT; UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT;
@ -3429,10 +3429,10 @@ Index: acpica-unix2-20161222/source/components/namespace/nsaccess.c
AcpiUtGetTypeName (ThisNode->Type), AcpiUtGetTypeName (ThisNode->Type),
AcpiUtGetTypeName (TypeToCheckFor))); AcpiUtGetTypeName (TypeToCheckFor)));
} }
Index: acpica-unix2-20161222/source/components/namespace/nsparse.c Index: acpica-unix2-20170119/source/components/namespace/nsparse.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/namespace/nsparse.c --- acpica-unix2-20170119.orig/source/components/namespace/nsparse.c
+++ acpica-unix2-20161222/source/components/namespace/nsparse.c +++ acpica-unix2-20170119/source/components/namespace/nsparse.c
@@ -196,13 +196,14 @@ AcpiNsOneCompleteParse ( @@ -196,13 +196,14 @@ AcpiNsOneCompleteParse (
/* Table must consist of at least a complete header */ /* Table must consist of at least a complete header */
@ -3450,10 +3450,10 @@ Index: acpica-unix2-20161222/source/components/namespace/nsparse.c
Status = AcpiTbGetOwnerId (TableIndex, &OwnerId); Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
Index: acpica-unix2-20161222/source/components/tables/tbdata.c Index: acpica-unix2-20170119/source/components/tables/tbdata.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/tables/tbdata.c --- acpica-unix2-20170119.orig/source/components/tables/tbdata.c
+++ acpica-unix2-20161222/source/components/tables/tbdata.c +++ acpica-unix2-20170119/source/components/tables/tbdata.c
@@ -407,6 +407,7 @@ AcpiTbVerifyTempTable ( @@ -407,6 +407,7 @@ AcpiTbVerifyTempTable (
char *Signature) char *Signature)
{ {
@ -3472,10 +3472,10 @@ Index: acpica-unix2-20161222/source/components/tables/tbdata.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY, ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
Index: acpica-unix2-20161222/source/components/tables/tbfadt.c Index: acpica-unix2-20170119/source/components/tables/tbfadt.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/tables/tbfadt.c --- acpica-unix2-20170119.orig/source/components/tables/tbfadt.c
+++ acpica-unix2-20161222/source/components/tables/tbfadt.c +++ acpica-unix2-20170119/source/components/tables/tbfadt.c
@@ -520,6 +520,8 @@ AcpiTbConvertFadt ( @@ -520,6 +520,8 @@ AcpiTbConvertFadt (
UINT8 Length; UINT8 Length;
UINT8 Flags; UINT8 Flags;
@ -3555,10 +3555,10 @@ Index: acpica-unix2-20161222/source/components/tables/tbfadt.c
"PmRegisters", 0); "PmRegisters", 0);
} }
} }
Index: acpica-unix2-20161222/source/components/tables/tbfind.c Index: acpica-unix2-20170119/source/components/tables/tbfind.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/tables/tbfind.c --- acpica-unix2-20170119.orig/source/components/tables/tbfind.c
+++ acpica-unix2-20161222/source/components/tables/tbfind.c +++ acpica-unix2-20170119/source/components/tables/tbfind.c
@@ -108,8 +108,11 @@ AcpiTbFindTable ( @@ -108,8 +108,11 @@ AcpiTbFindTable (
(void) AcpiUtAcquireMutex (ACPI_MTX_TABLES); (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i) for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
@ -3572,10 +3572,10 @@ Index: acpica-unix2-20161222/source/components/tables/tbfind.c
{ {
/* Not the requested table */ /* Not the requested table */
Index: acpica-unix2-20161222/source/components/tables/tbprint.c Index: acpica-unix2-20170119/source/components/tables/tbprint.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/tables/tbprint.c --- acpica-unix2-20170119.orig/source/components/tables/tbprint.c
+++ acpica-unix2-20161222/source/components/tables/tbprint.c +++ acpica-unix2-20170119/source/components/tables/tbprint.c
@@ -143,15 +143,18 @@ AcpiTbPrintTableHeader ( @@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
ACPI_TABLE_HEADER *Header) ACPI_TABLE_HEADER *Header)
{ {
@ -3617,10 +3617,10 @@ Index: acpica-unix2-20161222/source/components/tables/tbprint.c
} }
} }
Index: acpica-unix2-20161222/source/components/tables/tbutils.c Index: acpica-unix2-20170119/source/components/tables/tbutils.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/tables/tbutils.c --- acpica-unix2-20170119.orig/source/components/tables/tbutils.c
+++ acpica-unix2-20161222/source/components/tables/tbutils.c +++ acpica-unix2-20170119/source/components/tables/tbutils.c
@@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry ( @@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
* 64-bit platform, XSDT: Move (unaligned) 64-bit to local, * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
* return 64-bit * return 64-bit
@ -3680,10 +3680,10 @@ Index: acpica-unix2-20161222/source/components/tables/tbutils.c
{ {
AcpiGbl_FadtIndex = TableIndex; AcpiGbl_FadtIndex = TableIndex;
AcpiTbParseFadt (); AcpiTbParseFadt ();
Index: acpica-unix2-20161222/source/components/tables/tbxface.c Index: acpica-unix2-20170119/source/components/tables/tbxface.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/tables/tbxface.c --- acpica-unix2-20170119.orig/source/components/tables/tbxface.c
+++ acpica-unix2-20161222/source/components/tables/tbxface.c +++ acpica-unix2-20170119/source/components/tables/tbxface.c
@@ -263,8 +263,11 @@ AcpiGetTableHeader ( @@ -263,8 +263,11 @@ AcpiGetTableHeader (
for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++) for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
@ -3697,10 +3697,10 @@ Index: acpica-unix2-20161222/source/components/tables/tbxface.c
{ {
continue; continue;
} }
Index: acpica-unix2-20161222/source/components/tables/tbxfload.c Index: acpica-unix2-20170119/source/components/tables/tbxfload.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/components/tables/tbxfload.c --- acpica-unix2-20170119.orig/source/components/tables/tbxfload.c
+++ acpica-unix2-20161222/source/components/tables/tbxfload.c +++ acpica-unix2-20170119/source/components/tables/tbxfload.c
@@ -156,6 +156,7 @@ AcpiTbLoadNamespace ( @@ -156,6 +156,7 @@ AcpiTbLoadNamespace (
ACPI_TABLE_DESC *Table; ACPI_TABLE_DESC *Table;
UINT32 TablesLoaded = 0; UINT32 TablesLoaded = 0;
@ -3720,10 +3720,10 @@ Index: acpica-unix2-20161222/source/components/tables/tbxfload.c
ACPI_FAILURE (AcpiTbValidateTable (Table))) ACPI_FAILURE (AcpiTbValidateTable (Table)))
{ {
Status = AE_NO_ACPI_TABLES; Status = AE_NO_ACPI_TABLES;
Index: acpica-unix2-20161222/source/include/acmacros.h Index: acpica-unix2-20170119/source/include/acmacros.h
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/include/acmacros.h --- acpica-unix2-20170119.orig/source/include/acmacros.h
+++ acpica-unix2-20161222/source/include/acmacros.h +++ acpica-unix2-20170119/source/include/acmacros.h
@@ -98,7 +98,9 @@ @@ -98,7 +98,9 @@
((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\ ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];} ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
@ -3787,11 +3787,11 @@ Index: acpica-unix2-20161222/source/include/acmacros.h
#define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */ #define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */
Index: acpica-unix2-20161222/source/include/platform/aclinux.h Index: acpica-unix2-20170119/source/include/platform/aclinux.h
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/include/platform/aclinux.h --- acpica-unix2-20170119.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20161222/source/include/platform/aclinux.h +++ acpica-unix2-20170119/source/include/platform/aclinux.h
@@ -212,6 +212,10 @@ @@ -219,6 +219,10 @@
#define __cdecl #define __cdecl
#endif #endif
@ -3802,10 +3802,10 @@ Index: acpica-unix2-20161222/source/include/platform/aclinux.h
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ACLINUX_H__ */ #endif /* __ACLINUX_H__ */
Index: acpica-unix2-20161222/source/tools/acpiexec/aetables.c Index: acpica-unix2-20170119/source/tools/acpiexec/aetables.c
=================================================================== ===================================================================
--- acpica-unix2-20161222.orig/source/tools/acpiexec/aetables.c --- acpica-unix2-20170119.orig/source/tools/acpiexec/aetables.c
+++ acpica-unix2-20161222/source/tools/acpiexec/aetables.c +++ acpica-unix2-20170119/source/tools/acpiexec/aetables.c
@@ -146,21 +146,25 @@ AeInitializeTableHeader ( @@ -146,21 +146,25 @@ AeInitializeTableHeader (
char *Signature, char *Signature,
UINT32 Length) UINT32 Length)