diff --git a/.gitignore b/.gitignore index 565785a..f5d8656 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,5 @@ /acpitests-unix-20160930.tar.gz /acpica-unix2-20161117.tar.gz /acpitests-unix-20161117.tar.gz +/acpica-unix2-20161222.tar.gz +/acpitests-unix-20161222.tar.gz diff --git a/OPT_LDFLAGS.patch b/OPT_LDFLAGS.patch index 3c45f9e..1a6a60c 100644 --- a/OPT_LDFLAGS.patch +++ b/OPT_LDFLAGS.patch @@ -1,7 +1,7 @@ -Index: acpica-unix2-20161117/generate/unix/Makefile.config +Index: acpica-unix2-20161222/generate/unix/Makefile.config =================================================================== ---- acpica-unix2-20161117.orig/generate/unix/Makefile.config -+++ acpica-unix2-20161117/generate/unix/Makefile.config +--- acpica-unix2-20161222.orig/generate/unix/Makefile.config ++++ acpica-unix2-20161222/generate/unix/Makefile.config @@ -23,6 +23,9 @@ # OPT_CFLAGS can be overridden on the make command line by # adding OPT_CFLAGS="..." to the invocation. diff --git a/acpica-tools.spec b/acpica-tools.spec index a7f6c99..1cbbc91 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -1,5 +1,5 @@ Name: acpica-tools -Version: 20161117 +Version: 20161222 Release: 1%{?dist} Summary: ACPICA tools for the development and debug of ACPI tables @@ -33,9 +33,8 @@ Patch6: int-format.patch Patch7: f23-harden.patch Patch8: asllookup-ppc64.patch Patch9: template.patch -Patch10: s390x-ptrs.patch -Patch11: free.patch -Patch12: update-big-endian.patch +Patch10: free.patch +Patch11: update-big-endian.patch BuildRequires: bison patchutils flex @@ -95,9 +94,8 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f - %patch7 -p1 -b .f23-harden %patch8 -p1 -b .asllookup-ppc64 %patch9 -p1 -b .template -%patch10 -p1 -b .s390x-ptrs -%patch11 -p1 -b .free -%patch12 -p1 -b .update-big-endian +%patch10 -p1 -b .free +%patch11 -p1 -b .update-big-endian cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE3} iasl.1 @@ -192,7 +190,7 @@ fi %changelog -* Mon Jan 9 2017 Al Stone - 20161117-1 +* Mon Jan 9 2017 Al Stone - 20161222-1 - Update to latest upstream. Closes BZ#1381017. - Refresh patches. diff --git a/asllookup-miscompare.patch b/asllookup-miscompare.patch index 5134850..9b2305c 100644 --- a/asllookup-miscompare.patch +++ b/asllookup-miscompare.patch @@ -7,10 +7,10 @@ From: Al Stone source/compiler/asllookup.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: acpica-unix2-20161117/source/compiler/asllookup.c +Index: acpica-unix2-20161222/source/compiler/asllookup.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/asllookup.c -+++ acpica-unix2-20161117/source/compiler/asllookup.c +--- acpica-unix2-20161222.orig/source/compiler/asllookup.c ++++ acpica-unix2-20161222/source/compiler/asllookup.c @@ -119,6 +119,7 @@ LkIsObjectUsed ( { ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle); diff --git a/asllookup-ppc64.patch b/asllookup-ppc64.patch index 18c0548..cef59c4 100644 --- a/asllookup-ppc64.patch +++ b/asllookup-ppc64.patch @@ -7,10 +7,10 @@ From: Al Stone source/compiler/asllookup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: acpica-unix2-20161117/source/compiler/asllookup.c +Index: acpica-unix2-20161222/source/compiler/asllookup.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/asllookup.c -+++ acpica-unix2-20161117/source/compiler/asllookup.c +--- acpica-unix2-20161222.orig/source/compiler/asllookup.c ++++ acpica-unix2-20161222/source/compiler/asllookup.c @@ -176,7 +176,8 @@ LkIsObjectUsed ( * We ignore the predefined methods since often, not * all arguments are needed or used. diff --git a/debian-big_endian.patch b/debian-big_endian.patch index b3c74c5..55dc374 100644 --- a/debian-big_endian.patch +++ b/debian-big_endian.patch @@ -18,10 +18,10 @@ support source/include/platform/aclinux.h | 8 ++ 12 files changed, 487 insertions(+), 283 deletions(-) -Index: acpica-unix2-20161117/source/compiler/aslcodegen.c +Index: acpica-unix2-20161222/source/compiler/aslcodegen.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslcodegen.c -+++ acpica-unix2-20161117/source/compiler/aslcodegen.c +--- acpica-unix2-20161222.orig/source/compiler/aslcodegen.c ++++ acpica-unix2-20161222/source/compiler/aslcodegen.c @@ -243,16 +243,12 @@ CgWriteAmlOpcode ( ACPI_PARSE_OBJECT *Op) { @@ -263,10 +263,10 @@ Index: acpica-unix2-20161117/source/compiler/aslcodegen.c case AML_RAW_DATA_BUFFER: -Index: acpica-unix2-20161117/source/compiler/aslopcodes.c +Index: acpica-unix2-20161222/source/compiler/aslopcodes.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslopcodes.c -+++ acpica-unix2-20161117/source/compiler/aslopcodes.c +--- acpica-unix2-20161222.orig/source/compiler/aslopcodes.c ++++ acpica-unix2-20161222/source/compiler/aslopcodes.c @@ -485,6 +485,7 @@ OpcDoUnicode ( UINT32 i; UINT8 *AsciiString; @@ -285,10 +285,10 @@ Index: acpica-unix2-20161117/source/compiler/aslopcodes.c } /* -Index: acpica-unix2-20161117/source/compiler/aslrestype1.c +Index: acpica-unix2-20161222/source/compiler/aslrestype1.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslrestype1.c -+++ acpica-unix2-20161117/source/compiler/aslrestype1.c +--- acpica-unix2-20161222.orig/source/compiler/aslrestype1.c ++++ acpica-unix2-20161222/source/compiler/aslrestype1.c @@ -142,6 +142,11 @@ RsDoMemory24Descriptor ( ACPI_PARSE_OBJECT *LengthOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -485,10 +485,10 @@ Index: acpica-unix2-20161117/source/compiler/aslrestype1.c RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength)); break; -Index: acpica-unix2-20161117/source/compiler/aslrestype1i.c +Index: acpica-unix2-20161222/source/compiler/aslrestype1i.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslrestype1i.c -+++ acpica-unix2-20161117/source/compiler/aslrestype1i.c +--- acpica-unix2-20161222.orig/source/compiler/aslrestype1i.c ++++ acpica-unix2-20161222/source/compiler/aslrestype1i.c @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor ( ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -625,10 +625,10 @@ Index: acpica-unix2-20161117/source/compiler/aslrestype1i.c + ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask); return (Rnode); } -Index: acpica-unix2-20161117/source/compiler/aslrestype2.c +Index: acpica-unix2-20161222/source/compiler/aslrestype2.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslrestype2.c -+++ acpica-unix2-20161117/source/compiler/aslrestype2.c +--- acpica-unix2-20161222.orig/source/compiler/aslrestype2.c ++++ acpica-unix2-20161222/source/compiler/aslrestype2.c @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor ( ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -725,10 +725,10 @@ Index: acpica-unix2-20161117/source/compiler/aslrestype2.c /* Point to end-of-descriptor for vendor data */ -Index: acpica-unix2-20161117/source/compiler/aslrestype2d.c +Index: acpica-unix2-20161222/source/compiler/aslrestype2d.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslrestype2d.c -+++ acpica-unix2-20161117/source/compiler/aslrestype2d.c +--- acpica-unix2-20161222.orig/source/compiler/aslrestype2d.c ++++ acpica-unix2-20161222/source/compiler/aslrestype2d.c @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -1084,10 +1084,10 @@ Index: acpica-unix2-20161117/source/compiler/aslrestype2d.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix2-20161117/source/compiler/aslrestype2e.c +Index: acpica-unix2-20161222/source/compiler/aslrestype2e.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslrestype2e.c -+++ acpica-unix2-20161117/source/compiler/aslrestype2e.c +--- acpica-unix2-20161222.orig/source/compiler/aslrestype2e.c ++++ acpica-unix2-20161222/source/compiler/aslrestype2e.c @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -1193,10 +1193,10 @@ Index: acpica-unix2-20161117/source/compiler/aslrestype2e.c Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + StringLength; return (Rnode); -Index: acpica-unix2-20161117/source/compiler/aslrestype2q.c +Index: acpica-unix2-20161222/source/compiler/aslrestype2q.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslrestype2q.c -+++ acpica-unix2-20161117/source/compiler/aslrestype2q.c +--- acpica-unix2-20161222.orig/source/compiler/aslrestype2q.c ++++ acpica-unix2-20161222/source/compiler/aslrestype2q.c @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT8 *OptionalFields; @@ -1535,10 +1535,10 @@ Index: acpica-unix2-20161117/source/compiler/aslrestype2q.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix2-20161117/source/compiler/aslrestype2s.c +Index: acpica-unix2-20161222/source/compiler/aslrestype2s.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslrestype2s.c -+++ acpica-unix2-20161117/source/compiler/aslrestype2s.c +--- acpica-unix2-20161222.orig/source/compiler/aslrestype2s.c ++++ acpica-unix2-20161222/source/compiler/aslrestype2s.c @@ -290,6 +290,9 @@ RsDoGpioIntDescriptor ( UINT16 VendorLength; UINT16 InterruptLength; @@ -1852,10 +1852,10 @@ Index: acpica-unix2-20161117/source/compiler/aslrestype2s.c MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); return (Rnode); } -Index: acpica-unix2-20161117/source/compiler/aslrestype2w.c +Index: acpica-unix2-20161222/source/compiler/aslrestype2w.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslrestype2w.c -+++ acpica-unix2-20161117/source/compiler/aslrestype2w.c +--- acpica-unix2-20161222.orig/source/compiler/aslrestype2w.c ++++ acpica-unix2-20161222/source/compiler/aslrestype2w.c @@ -81,6 +81,12 @@ RsDoWordIoDescriptor ( UINT8 *OptionalFields; UINT16 StringLength = 0; @@ -2199,10 +2199,10 @@ Index: acpica-unix2-20161117/source/compiler/aslrestype2w.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix2-20161117/source/include/acmacros.h +Index: acpica-unix2-20161222/source/include/acmacros.h =================================================================== ---- acpica-unix2-20161117.orig/source/include/acmacros.h -+++ acpica-unix2-20161117/source/include/acmacros.h +--- acpica-unix2-20161222.orig/source/include/acmacros.h ++++ acpica-unix2-20161222/source/include/acmacros.h @@ -100,7 +100,8 @@ /* 32-bit source, 16/32/64 destination */ @@ -2240,11 +2240,11 @@ Index: acpica-unix2-20161117/source/include/acmacros.h #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) -Index: acpica-unix2-20161117/source/include/platform/aclinux.h +Index: acpica-unix2-20161222/source/include/platform/aclinux.h =================================================================== ---- acpica-unix2-20161117.orig/source/include/platform/aclinux.h -+++ acpica-unix2-20161117/source/include/platform/aclinux.h -@@ -179,6 +179,7 @@ +--- acpica-unix2-20161222.orig/source/include/platform/aclinux.h ++++ acpica-unix2-20161222/source/include/platform/aclinux.h +@@ -181,6 +181,7 @@ #ifdef ACPI_USE_STANDARD_HEADERS #include diff --git a/debian-unaligned.patch b/debian-unaligned.patch index 19e4551..7a6c261 100644 --- a/debian-unaligned.patch +++ b/debian-unaligned.patch @@ -18,10 +18,10 @@ Signed-off-by: Paolo Bonzini source/include/actypes.h | 26 +++++++++++++------------- 3 files changed, 32 insertions(+), 21 deletions(-) -Index: acpica-unix2-20161117/source/compiler/asltree.c +Index: acpica-unix2-20161222/source/compiler/asltree.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/asltree.c -+++ acpica-unix2-20161117/source/compiler/asltree.c +--- acpica-unix2-20161222.orig/source/compiler/asltree.c ++++ acpica-unix2-20161222/source/compiler/asltree.c @@ -913,28 +913,31 @@ TrCreateValuedLeafNode ( "Op %s Value %8.8X%8.8X ", Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode), @@ -74,10 +74,10 @@ Index: acpica-unix2-20161117/source/compiler/asltree.c break; } -Index: acpica-unix2-20161117/source/components/executer/exoparg2.c +Index: acpica-unix2-20161222/source/components/executer/exoparg2.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/executer/exoparg2.c -+++ acpica-unix2-20161117/source/components/executer/exoparg2.c +--- acpica-unix2-20161222.orig/source/components/executer/exoparg2.c ++++ acpica-unix2-20161222/source/components/executer/exoparg2.c @@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R ( ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL; @@ -118,10 +118,10 @@ Index: acpica-unix2-20161117/source/components/executer/exoparg2.c break; case AML_CONCAT_OP: /* Concatenate (Data1, Data2, Result) */ -Index: acpica-unix2-20161117/source/include/actypes.h +Index: acpica-unix2-20161222/source/include/actypes.h =================================================================== ---- acpica-unix2-20161117.orig/source/include/actypes.h -+++ acpica-unix2-20161117/source/include/actypes.h +--- acpica-unix2-20161222.orig/source/include/actypes.h ++++ acpica-unix2-20161222/source/include/actypes.h @@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64 */ #define ACPI_THREAD_ID UINT64 diff --git a/f23-harden.patch b/f23-harden.patch index bdb5936..a8369c6 100644 --- a/f23-harden.patch +++ b/f23-harden.patch @@ -8,10 +8,10 @@ From: Al Stone generate/unix/iasl/Makefile | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) -Index: acpica-unix2-20161117/generate/unix/Makefile.config +Index: acpica-unix2-20161222/generate/unix/Makefile.config =================================================================== ---- acpica-unix2-20161117.orig/generate/unix/Makefile.config -+++ acpica-unix2-20161117/generate/unix/Makefile.config +--- acpica-unix2-20161222.orig/generate/unix/Makefile.config ++++ acpica-unix2-20161222/generate/unix/Makefile.config @@ -171,6 +171,8 @@ ifneq ($(NOFORTIFY),TRUE) OPT_CFLAGS += -D_FORTIFY_SOURCE=2 endif @@ -21,10 +21,10 @@ Index: acpica-unix2-20161117/generate/unix/Makefile.config CFLAGS += \ -D$(HOST)\ -D_GNU_SOURCE\ -Index: acpica-unix2-20161117/generate/unix/iasl/Makefile +Index: acpica-unix2-20161222/generate/unix/iasl/Makefile =================================================================== ---- acpica-unix2-20161117.orig/generate/unix/iasl/Makefile -+++ acpica-unix2-20161117/generate/unix/iasl/Makefile +--- acpica-unix2-20161222.orig/generate/unix/iasl/Makefile ++++ acpica-unix2-20161222/generate/unix/iasl/Makefile @@ -319,20 +319,21 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa # Cannot use the common compile warning flags since the C files are created # by the utilities above and they are not necessarily ANSI C, etc. diff --git a/free.patch b/free.patch index 09b8e76..03488fc 100644 --- a/free.patch +++ b/free.patch @@ -1,9 +1,9 @@ This prevents a segfault when an Include file does not exist. -Index: acpica-unix2-20161117/source/compiler/aslfiles.c +Index: acpica-unix2-20161222/source/compiler/aslfiles.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslfiles.c -+++ acpica-unix2-20161117/source/compiler/aslfiles.c +--- acpica-unix2-20161222.orig/source/compiler/aslfiles.c ++++ acpica-unix2-20161222/source/compiler/aslfiles.c @@ -319,7 +319,7 @@ FlOpenIncludeWithPrefix ( if (!IncludeFile) { diff --git a/int-format.patch b/int-format.patch index a8c0fa7..d14cbf0 100644 --- a/int-format.patch +++ b/int-format.patch @@ -24,10 +24,10 @@ From: Al Stone source/tools/acpiexec/aemain.c | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-) -Index: acpica-unix2-20161117/source/compiler/aslcompile.c +Index: acpica-unix2-20161222/source/compiler/aslcompile.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslcompile.c -+++ acpica-unix2-20161117/source/compiler/aslcompile.c +--- acpica-unix2-20161222.orig/source/compiler/aslcompile.c ++++ acpica-unix2-20161222/source/compiler/aslcompile.c @@ -729,7 +729,7 @@ CmCleanupAndExit ( if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) @@ -37,10 +37,10 @@ Index: acpica-unix2-20161117/source/compiler/aslcompile.c ASL_MAX_ERROR_COUNT); } -Index: acpica-unix2-20161117/source/compiler/aslerror.c +Index: acpica-unix2-20161222/source/compiler/aslerror.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslerror.c -+++ acpica-unix2-20161117/source/compiler/aslerror.c +--- acpica-unix2-20161222.orig/source/compiler/aslerror.c ++++ acpica-unix2-20161222/source/compiler/aslerror.c @@ -687,7 +687,7 @@ AslCommonError ( Gbl_ExceptionCount[Level]++; if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) @@ -59,10 +59,10 @@ Index: acpica-unix2-20161117/source/compiler/aslerror.c ASL_MAX_DISABLED_MESSAGES); return (AE_LIMIT); } -Index: acpica-unix2-20161117/source/compiler/aslopt.c +Index: acpica-unix2-20161222/source/compiler/aslopt.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslopt.c -+++ acpica-unix2-20161117/source/compiler/aslopt.c +--- acpica-unix2-20161222.orig/source/compiler/aslopt.c ++++ acpica-unix2-20161222/source/compiler/aslopt.c @@ -584,7 +584,7 @@ OptOptimizeNamePath ( } @@ -72,10 +72,10 @@ Index: acpica-unix2-20161117/source/compiler/aslopt.c Op->Asl.LogicalLineNumber, AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode), AcpiPsGetOpcodeName (Op->Common.AmlOpcode))); -Index: acpica-unix2-20161117/source/compiler/aslpredef.c +Index: acpica-unix2-20161222/source/compiler/aslpredef.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslpredef.c -+++ acpica-unix2-20161117/source/compiler/aslpredef.c +--- acpica-unix2-20161222.orig/source/compiler/aslpredef.c ++++ acpica-unix2-20161222/source/compiler/aslpredef.c @@ -114,7 +114,7 @@ ApCheckForPredefinedMethod ( if (MethodInfo->NumArguments != 0) @@ -85,10 +85,10 @@ Index: acpica-unix2-20161117/source/compiler/aslpredef.c AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op, MsgBuffer); -Index: acpica-unix2-20161117/source/compiler/aslprepkg.c +Index: acpica-unix2-20161222/source/compiler/aslprepkg.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslprepkg.c -+++ acpica-unix2-20161117/source/compiler/aslprepkg.c +--- acpica-unix2-20161222.orig/source/compiler/aslprepkg.c ++++ acpica-unix2-20161222/source/compiler/aslprepkg.c @@ -309,7 +309,7 @@ ApCheckPackage ( if (Count & 1) @@ -98,10 +98,10 @@ Index: acpica-unix2-20161117/source/compiler/aslprepkg.c Predefined->Info.Name, Count); AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH, -Index: acpica-unix2-20161117/source/components/debugger/dbexec.c +Index: acpica-unix2-20161222/source/components/debugger/dbexec.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/debugger/dbexec.c -+++ acpica-unix2-20161117/source/components/debugger/dbexec.c +--- acpica-unix2-20161222.orig/source/components/debugger/dbexec.c ++++ acpica-unix2-20161222/source/components/debugger/dbexec.c @@ -214,7 +214,7 @@ AcpiDbExecuteMethod ( ACPI_ERROR ((AE_INFO, "Possible overflow of internal debugger " @@ -111,10 +111,10 @@ Index: acpica-unix2-20161117/source/components/debugger/dbexec.c } } -Index: acpica-unix2-20161117/source/components/dispatcher/dsmthdat.c +Index: acpica-unix2-20161222/source/components/dispatcher/dsmthdat.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/dispatcher/dsmthdat.c -+++ acpica-unix2-20161117/source/components/dispatcher/dsmthdat.c +--- acpica-unix2-20161222.orig/source/components/dispatcher/dsmthdat.c ++++ acpica-unix2-20161222/source/components/dispatcher/dsmthdat.c @@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode ( if (Index > ACPI_METHOD_MAX_LOCAL) { @@ -133,10 +133,10 @@ Index: acpica-unix2-20161117/source/components/dispatcher/dsmthdat.c Index, ACPI_METHOD_MAX_ARG)); return_ACPI_STATUS (AE_AML_INVALID_INDEX); } -Index: acpica-unix2-20161117/source/components/dispatcher/dsutils.c +Index: acpica-unix2-20161222/source/components/dispatcher/dsutils.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/dispatcher/dsutils.c -+++ acpica-unix2-20161117/source/components/dispatcher/dsutils.c +--- acpica-unix2-20161222.orig/source/components/dispatcher/dsutils.c ++++ acpica-unix2-20161222/source/components/dispatcher/dsutils.c @@ -793,7 +793,7 @@ AcpiDsCreateOperands ( } @@ -146,10 +146,10 @@ Index: acpica-unix2-20161117/source/components/dispatcher/dsutils.c WalkState->NumOperands, ArgCount, Index)); /* Create the interpreter arguments, in reverse order */ -Index: acpica-unix2-20161117/source/components/dispatcher/dswscope.c +Index: acpica-unix2-20161222/source/components/dispatcher/dswscope.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/dispatcher/dswscope.c -+++ acpica-unix2-20161117/source/components/dispatcher/dswscope.c +--- acpica-unix2-20161222.orig/source/components/dispatcher/dswscope.c ++++ acpica-unix2-20161222/source/components/dispatcher/dswscope.c @@ -149,7 +149,7 @@ AcpiDsScopeStackPush ( WalkState->ScopeDepth++; @@ -168,10 +168,10 @@ Index: acpica-unix2-20161117/source/components/dispatcher/dswscope.c (UINT32) WalkState->ScopeDepth, AcpiUtGetNodeName (ScopeInfo->Scope.Node), AcpiUtGetTypeName (ScopeInfo->Common.Value))); -Index: acpica-unix2-20161117/source/components/events/evgpe.c +Index: acpica-unix2-20161222/source/components/events/evgpe.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/events/evgpe.c -+++ acpica-unix2-20161117/source/components/events/evgpe.c +--- acpica-unix2-20161222.orig/source/components/events/evgpe.c ++++ acpica-unix2-20161222/source/components/events/evgpe.c @@ -494,7 +494,7 @@ AcpiEvGpeDetect ( "Ignore disabled registers for GPE %02X-%02X: " "RunEnable=%02X, WakeEnable=%02X\n", @@ -190,10 +190,10 @@ Index: acpica-unix2-20161117/source/components/events/evgpe.c StatusReg, EnableReg, GpeRegisterInfo->EnableForRun, GpeRegisterInfo->EnableForWake)); -Index: acpica-unix2-20161117/source/components/executer/exdump.c +Index: acpica-unix2-20161222/source/components/executer/exdump.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/executer/exdump.c -+++ acpica-unix2-20161117/source/components/executer/exdump.c +--- acpica-unix2-20161222.orig/source/components/executer/exdump.c ++++ acpica-unix2-20161222/source/components/executer/exdump.c @@ -668,7 +668,7 @@ AcpiExDumpOperand ( if (Depth > 0) { @@ -203,10 +203,10 @@ Index: acpica-unix2-20161117/source/components/executer/exdump.c } else { -Index: acpica-unix2-20161117/source/components/executer/exfldio.c +Index: acpica-unix2-20161222/source/components/executer/exfldio.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/executer/exfldio.c -+++ acpica-unix2-20161117/source/components/executer/exfldio.c +--- acpica-unix2-20161222.orig/source/components/executer/exfldio.c ++++ acpica-unix2-20161222/source/components/executer/exfldio.c @@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule ( ACPI_ERROR ((AE_INFO, @@ -218,10 +218,10 @@ Index: acpica-unix2-20161117/source/components/executer/exfldio.c return_ACPI_STATUS (AE_AML_OPERAND_VALUE); } } -Index: acpica-unix2-20161117/source/components/executer/exnames.c +Index: acpica-unix2-20161222/source/components/executer/exnames.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/executer/exnames.c -+++ acpica-unix2-20161117/source/components/executer/exnames.c +--- acpica-unix2-20161222.orig/source/components/executer/exnames.c ++++ acpica-unix2-20161222/source/components/executer/exnames.c @@ -240,7 +240,7 @@ AcpiExNameSegment ( */ ACPI_DEBUG_PRINT ((ACPI_DB_INFO, @@ -240,11 +240,11 @@ Index: acpica-unix2-20161117/source/components/executer/exnames.c } *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress); -Index: acpica-unix2-20161117/source/components/hardware/hwregs.c +Index: acpica-unix2-20161222/source/components/hardware/hwregs.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/hardware/hwregs.c -+++ acpica-unix2-20161117/source/components/hardware/hwregs.c -@@ -300,7 +300,7 @@ AcpiHwClearAcpiStatus ( +--- acpica-unix2-20161222.orig/source/components/hardware/hwregs.c ++++ acpica-unix2-20161222/source/components/hardware/hwregs.c +@@ -464,7 +464,7 @@ AcpiHwClearAcpiStatus ( ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %8.8X%8.8X\n", @@ -253,10 +253,10 @@ Index: acpica-unix2-20161117/source/components/hardware/hwregs.c ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address))); LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock); -Index: acpica-unix2-20161117/source/components/tables/tbfadt.c +Index: acpica-unix2-20161222/source/components/tables/tbfadt.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/tables/tbfadt.c -+++ acpica-unix2-20161117/source/components/tables/tbfadt.c +--- acpica-unix2-20161222.orig/source/components/tables/tbfadt.c ++++ acpica-unix2-20161222/source/components/tables/tbfadt.c @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress ( if (!(Flags & ACPI_FADT_GPE_REGISTER)) { @@ -284,10 +284,10 @@ Index: acpica-unix2-20161117/source/components/tables/tbfadt.c Name, Address32, ACPI_FORMAT_UINT64 (Address64->Address), AcpiGbl_Use32BitFadtAddresses ? 32 : 64)); -Index: acpica-unix2-20161117/source/components/tables/tbxfroot.c +Index: acpica-unix2-20161222/source/components/tables/tbxfroot.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/tables/tbxfroot.c -+++ acpica-unix2-20161117/source/components/tables/tbxfroot.c +--- acpica-unix2-20161222.orig/source/components/tables/tbxfroot.c ++++ acpica-unix2-20161222/source/components/tables/tbxfroot.c @@ -177,7 +177,7 @@ AcpiFindRootPointer ( { ACPI_ERROR ((AE_INFO, @@ -315,10 +315,10 @@ Index: acpica-unix2-20161117/source/components/tables/tbxfroot.c return_ACPI_STATUS (AE_NO_MEMORY); } -Index: acpica-unix2-20161117/source/components/utilities/utownerid.c +Index: acpica-unix2-20161222/source/components/utilities/utownerid.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/utilities/utownerid.c -+++ acpica-unix2-20161117/source/components/utilities/utownerid.c +--- acpica-unix2-20161222.orig/source/components/utilities/utownerid.c ++++ acpica-unix2-20161222/source/components/utilities/utownerid.c @@ -231,7 +231,7 @@ AcpiUtReleaseOwnerId ( else { @@ -328,11 +328,11 @@ Index: acpica-unix2-20161117/source/components/utilities/utownerid.c } (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES); -Index: acpica-unix2-20161117/source/tools/acpiexec/aemain.c +Index: acpica-unix2-20161222/source/tools/acpiexec/aemain.c =================================================================== ---- acpica-unix2-20161117.orig/source/tools/acpiexec/aemain.c -+++ acpica-unix2-20161117/source/tools/acpiexec/aemain.c -@@ -207,7 +207,7 @@ AeDoOptions ( +--- acpica-unix2-20161222.orig/source/tools/acpiexec/aemain.c ++++ acpica-unix2-20161222/source/tools/acpiexec/aemain.c +@@ -203,7 +203,7 @@ AeDoOptions ( if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1)) { diff --git a/name-miscompare.patch b/name-miscompare.patch index c7979f0..bdaa5c2 100644 --- a/name-miscompare.patch +++ b/name-miscompare.patch @@ -10,10 +10,10 @@ made in the remainder of the function. source/compiler/aslanalyze.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: acpica-unix2-20161117/source/compiler/aslanalyze.c +Index: acpica-unix2-20161222/source/compiler/aslanalyze.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslanalyze.c -+++ acpica-unix2-20161117/source/compiler/aslanalyze.c +--- acpica-unix2-20161222.orig/source/compiler/aslanalyze.c ++++ acpica-unix2-20161222/source/compiler/aslanalyze.c @@ -461,7 +461,7 @@ ApCheckForGpeNameConflict ( /* Need a null-terminated string version of NameSeg */ diff --git a/re-enable-big-endian.patch b/re-enable-big-endian.patch index 7371b52..7221ee5 100644 --- a/re-enable-big-endian.patch +++ b/re-enable-big-endian.patch @@ -7,10 +7,10 @@ Al Stone source/compiler/aslmain.c | 12 ------------ 1 file changed, 12 deletions(-) -Index: acpica-unix2-20161117/source/compiler/aslmain.c +Index: acpica-unix2-20161222/source/compiler/aslmain.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslmain.c -+++ acpica-unix2-20161117/source/compiler/aslmain.c +--- acpica-unix2-20161222.orig/source/compiler/aslmain.c ++++ acpica-unix2-20161222/source/compiler/aslmain.c @@ -99,18 +99,6 @@ main ( int ReturnStatus = 0; diff --git a/s390x-ptrs.patch b/s390x-ptrs.patch deleted file mode 100644 index cf7a469..0000000 --- a/s390x-ptrs.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: acpica-unix2-20161117/source/include/platform/aclinux.h -=================================================================== ---- acpica-unix2-20161117.orig/source/include/platform/aclinux.h -+++ acpica-unix2-20161117/source/include/platform/aclinux.h -@@ -194,7 +194,8 @@ - #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread)) - - #if defined(__ia64__) || defined(__x86_64__) ||\ -- defined(__aarch64__) || defined(__PPC64__) -+ defined(__aarch64__) || defined(__PPC64__) ||\ -+ defined(__s390x__) - #define ACPI_MACHINE_WIDTH 64 - #define COMPILER_DEPENDENT_INT64 long - #define COMPILER_DEPENDENT_UINT64 unsigned long diff --git a/sources b/sources index a95c035..7bcff51 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (acpica-unix2-20161117.tar.gz) = fc7626a0729dc87043faec68027c5b6c98b62c95075f5b83aba6110a43a51719c555b550a42f4f624617a99e7d33cb8503f147c6a1dbb25f2cd6644538f4c9a2 -SHA512 (acpitests-unix-20161117.tar.gz) = 8b68bc294c31a56b0d7bd9ea61ddadb25b978e4fade16db7fb8bbb8ca0e89f364fc49a2b17c1d7f694bc79007934aa2ef00e06f0fb9675f5fa5029cf53b9e0e8 +SHA512 (acpica-unix2-20161222.tar.gz) = 3e116ea2c559bd9343ac9ccfac632626f42e7598c1cc95a4b906e28ceebb81a4a22cbcda61f1e0b354dd002978c1286a2cac4f9cacef3d8f255b816db0b179a0 +SHA512 (acpitests-unix-20161222.tar.gz) = ff0435f40564a94ceb3bc6cfc11ac859a5467b650004238092d7f3e2f7d596e7eb2fb9d3c56f0860c8324d38fcbedf3c6f4bc3f0569f1148462b824c7c025408 diff --git a/template.patch b/template.patch index 0ce8a78..e8b06f5 100644 --- a/template.patch +++ b/template.patch @@ -7,10 +7,10 @@ From: Al Stone tests/templates/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: acpica-unix2-20161117/tests/templates/Makefile +Index: acpica-unix2-20161222/tests/templates/Makefile =================================================================== ---- acpica-unix2-20161117.orig/tests/templates/Makefile -+++ acpica-unix2-20161117/tests/templates/Makefile +--- acpica-unix2-20161222.orig/tests/templates/Makefile ++++ acpica-unix2-20161222/tests/templates/Makefile @@ -2,7 +2,7 @@ PROG= templates diff --git a/update-big-endian.patch b/update-big-endian.patch index 9e43c6c..fb190cb 100644 --- a/update-big-endian.patch +++ b/update-big-endian.patch @@ -1,7 +1,7 @@ -Index: acpica-unix2-20161117/source/common/acfileio.c +Index: acpica-unix2-20161222/source/common/acfileio.c =================================================================== ---- acpica-unix2-20161117.orig/source/common/acfileio.c -+++ acpica-unix2-20161117/source/common/acfileio.c +--- acpica-unix2-20161222.orig/source/common/acfileio.c ++++ acpica-unix2-20161222/source/common/acfileio.c @@ -250,6 +250,7 @@ AcGetOneTableFromFile ( ACPI_TABLE_HEADER *Table; INT32 Count; @@ -63,10 +63,10 @@ Index: acpica-unix2-20161117/source/common/acfileio.c (UINT32) (FileSize - TableOffset)); return (AE_BAD_HEADER); } -Index: acpica-unix2-20161117/source/common/ahpredef.c +Index: acpica-unix2-20161222/source/common/ahpredef.c =================================================================== ---- acpica-unix2-20161117.orig/source/common/ahpredef.c -+++ acpica-unix2-20161117/source/common/ahpredef.c +--- acpica-unix2-20161222.orig/source/common/ahpredef.c ++++ acpica-unix2-20161222/source/common/ahpredef.c @@ -358,7 +358,7 @@ AcpiAhMatchPredefinedName ( char *Nameseg) { @@ -76,10 +76,10 @@ Index: acpica-unix2-20161117/source/common/ahpredef.c for (Info = AslPredefinedInfo; Info->Name; Info++) { -Index: acpica-unix2-20161117/source/common/dmtable.c +Index: acpica-unix2-20161222/source/common/dmtable.c =================================================================== ---- acpica-unix2-20161117.orig/source/common/dmtable.c -+++ acpica-unix2-20161117/source/common/dmtable.c +--- acpica-unix2-20161222.orig/source/common/dmtable.c ++++ acpica-unix2-20161222/source/common/dmtable.c @@ -499,7 +499,7 @@ AcpiDmDumpDataTable ( */ if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS)) @@ -178,10 +178,10 @@ Index: acpica-unix2-20161117/source/common/dmtable.c AcpiDmNfitSubnames[Temp16]); break; -Index: acpica-unix2-20161117/source/common/dmtables.c +Index: acpica-unix2-20161222/source/common/dmtables.c =================================================================== ---- acpica-unix2-20161117.orig/source/common/dmtables.c -+++ acpica-unix2-20161117/source/common/dmtables.c +--- acpica-unix2-20161222.orig/source/common/dmtables.c ++++ acpica-unix2-20161222/source/common/dmtables.c @@ -140,7 +140,9 @@ AdCreateTableHeader ( ACPI_TABLE_HEADER *Table) { @@ -247,10 +247,10 @@ Index: acpica-unix2-20161117/source/common/dmtables.c AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)); /* Create the root object */ -Index: acpica-unix2-20161117/source/common/dmtbdump.c +Index: acpica-unix2-20161222/source/common/dmtbdump.c =================================================================== ---- acpica-unix2-20161117.orig/source/common/dmtbdump.c -+++ acpica-unix2-20161117/source/common/dmtbdump.c +--- acpica-unix2-20161222.orig/source/common/dmtbdump.c ++++ acpica-unix2-20161222/source/common/dmtbdump.c @@ -277,6 +277,8 @@ AcpiDmDumpRsdt ( UINT32 Entries; UINT32 Offset; @@ -2064,10 +2064,10 @@ Index: acpica-unix2-20161117/source/common/dmtbdump.c + (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength, AcpiDmTableInfoWpbt0); } -Index: acpica-unix2-20161117/source/compiler/aslrestype2.c +Index: acpica-unix2-20161222/source/compiler/aslrestype2.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/aslrestype2.c -+++ acpica-unix2-20161117/source/compiler/aslrestype2.c +--- acpica-unix2-20161222.orig/source/compiler/aslrestype2.c ++++ acpica-unix2-20161222/source/compiler/aslrestype2.c @@ -98,21 +98,33 @@ RsDoGeneralRegisterDescriptor ( { case 0: /* Address space */ @@ -2114,10 +2114,10 @@ Index: acpica-unix2-20161117/source/compiler/aslrestype2.c RsCreateByteField (InitializerOp, ACPI_RESTAG_ACCESSSIZE, CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.AccessSize)); -Index: acpica-unix2-20161117/source/compiler/dtfield.c +Index: acpica-unix2-20161222/source/compiler/dtfield.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/dtfield.c -+++ acpica-unix2-20161117/source/compiler/dtfield.c +--- acpica-unix2-20161222.orig/source/compiler/dtfield.c ++++ acpica-unix2-20161222/source/compiler/dtfield.c @@ -360,7 +360,27 @@ DtCompileInteger ( DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, MsgBuffer); } @@ -2147,10 +2147,10 @@ Index: acpica-unix2-20161117/source/compiler/dtfield.c return; } -Index: acpica-unix2-20161117/source/compiler/dtsubtable.c +Index: acpica-unix2-20161222/source/compiler/dtsubtable.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/dtsubtable.c -+++ acpica-unix2-20161117/source/compiler/dtsubtable.c +--- acpica-unix2-20161222.orig/source/compiler/dtsubtable.c ++++ acpica-unix2-20161222/source/compiler/dtsubtable.c @@ -379,6 +379,21 @@ DtSetSubtableLength ( return; } @@ -2175,10 +2175,10 @@ Index: acpica-unix2-20161117/source/compiler/dtsubtable.c + Subtable->SizeOfLengthField); + } } -Index: acpica-unix2-20161117/source/compiler/dttable1.c +Index: acpica-unix2-20161222/source/compiler/dttable1.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/dttable1.c -+++ acpica-unix2-20161117/source/compiler/dttable1.c +--- acpica-unix2-20161222.orig/source/compiler/dttable1.c ++++ acpica-unix2-20161222/source/compiler/dttable1.c @@ -282,6 +282,8 @@ DtCompileCsrt ( DT_FIELD **PFieldList = (DT_FIELD **) List; UINT32 DescriptorCount; @@ -2552,10 +2552,10 @@ Index: acpica-unix2-20161117/source/compiler/dttable1.c return (AE_OK); } -Index: acpica-unix2-20161117/source/compiler/dttable2.c +Index: acpica-unix2-20161222/source/compiler/dttable2.c =================================================================== ---- acpica-unix2-20161117.orig/source/compiler/dttable2.c -+++ acpica-unix2-20161117/source/compiler/dttable2.c +--- acpica-unix2-20161222.orig/source/compiler/dttable2.c ++++ acpica-unix2-20161222/source/compiler/dttable2.c @@ -346,7 +346,7 @@ DtCompileMpst ( DtPushSubtable (Subtable); @@ -2712,10 +2712,10 @@ Index: acpica-unix2-20161117/source/compiler/dttable2.c ParentTable = DtPeekSubtable (); DtInsertSubtable (ParentTable, Subtable); -Index: acpica-unix2-20161117/source/components/disassembler/dmbuffer.c +Index: acpica-unix2-20161222/source/components/disassembler/dmbuffer.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/disassembler/dmbuffer.c -+++ acpica-unix2-20161117/source/components/disassembler/dmbuffer.c +--- acpica-unix2-20161222.orig/source/components/disassembler/dmbuffer.c ++++ acpica-unix2-20161222/source/components/disassembler/dmbuffer.c @@ -204,7 +204,7 @@ AcpiDmByteList ( @@ -2791,11 +2791,11 @@ Index: acpica-unix2-20161117/source/components/disassembler/dmbuffer.c NextOp = AcpiPsGetDepthNext (NULL, Op); if (!NextOp) -Index: acpica-unix2-20161117/source/components/disassembler/dmopcode.c +Index: acpica-unix2-20161222/source/components/disassembler/dmopcode.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/disassembler/dmopcode.c -+++ acpica-unix2-20161117/source/components/disassembler/dmopcode.c -@@ -244,6 +244,7 @@ AcpiDmPredefinedDescription ( +--- acpica-unix2-20161222.orig/source/components/disassembler/dmopcode.c ++++ acpica-unix2-20161222/source/components/disassembler/dmopcode.c +@@ -251,6 +251,7 @@ AcpiDmPredefinedDescription ( char *NameString; int LastCharIsDigit; int LastCharsAreHex; @@ -2803,7 +2803,7 @@ Index: acpica-unix2-20161117/source/components/disassembler/dmopcode.c if (!Op) -@@ -261,7 +262,9 @@ AcpiDmPredefinedDescription ( +@@ -268,7 +269,9 @@ AcpiDmPredefinedDescription ( /* Predefined name must start with an underscore */ @@ -2814,7 +2814,7 @@ Index: acpica-unix2-20161117/source/components/disassembler/dmopcode.c if (NameString[0] != '_') { return; -@@ -871,21 +874,26 @@ AcpiDmDisassembleOneOp ( +@@ -878,21 +881,26 @@ AcpiDmDisassembleOneOp ( AcpiDmNamestring (Op->Common.Value.Name); break; @@ -2846,10 +2846,10 @@ Index: acpica-unix2-20161117/source/components/disassembler/dmopcode.c Info->BitOffset += Offset; if (Info->BitOffset % 8 == 0) -Index: acpica-unix2-20161117/source/components/disassembler/dmresrcl2.c +Index: acpica-unix2-20161222/source/components/disassembler/dmresrcl2.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/disassembler/dmresrcl2.c -+++ acpica-unix2-20161117/source/components/disassembler/dmresrcl2.c +--- acpica-unix2-20161222.orig/source/components/disassembler/dmresrcl2.c ++++ acpica-unix2-20161222/source/components/disassembler/dmresrcl2.c @@ -191,22 +191,24 @@ AcpiDmGpioCommon ( char *DeviceName = NULL; UINT32 PinCount; @@ -3071,10 +3071,10 @@ Index: acpica-unix2-20161117/source/components/disassembler/dmresrcl2.c DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset); AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX); -Index: acpica-unix2-20161117/source/components/disassembler/dmresrcl.c +Index: acpica-unix2-20161222/source/components/disassembler/dmresrcl.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/disassembler/dmresrcl.c -+++ acpica-unix2-20161117/source/components/disassembler/dmresrcl.c +--- acpica-unix2-20161222.orig/source/components/disassembler/dmresrcl.c ++++ acpica-unix2-20161222/source/components/disassembler/dmresrcl.c @@ -141,7 +141,8 @@ AcpiDmMemoryFields ( UINT32 Level) { @@ -3223,10 +3223,10 @@ Index: acpica-unix2-20161117/source/components/disassembler/dmresrcl.c } AcpiDmIndent (Level); -Index: acpica-unix2-20161117/source/components/disassembler/dmresrcs.c +Index: acpica-unix2-20161222/source/components/disassembler/dmresrcs.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/disassembler/dmresrcs.c -+++ acpica-unix2-20161117/source/components/disassembler/dmresrcs.c +--- acpica-unix2-20161222.orig/source/components/disassembler/dmresrcs.c ++++ acpica-unix2-20161222/source/components/disassembler/dmresrcs.c @@ -72,6 +72,7 @@ AcpiDmIrqDescriptor ( UINT32 Length, UINT32 Level) @@ -3283,10 +3283,10 @@ Index: acpica-unix2-20161117/source/components/disassembler/dmresrcs.c AcpiDmIndent (Level + 1); AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length"); -Index: acpica-unix2-20161117/source/components/dispatcher/dsfield.c +Index: acpica-unix2-20161222/source/components/dispatcher/dsfield.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/dispatcher/dsfield.c -+++ acpica-unix2-20161117/source/components/dispatcher/dsfield.c +--- acpica-unix2-20161222.orig/source/components/dispatcher/dsfield.c ++++ acpica-unix2-20161222/source/components/dispatcher/dsfield.c @@ -318,6 +318,7 @@ AcpiDsGetFieldNames ( ACPI_STATUS Status; UINT64 Position; @@ -3331,10 +3331,10 @@ Index: acpica-unix2-20161117/source/components/dispatcher/dsfield.c if (ACPI_FAILURE (Status)) { ACPI_ERROR_NAMESPACE ((char *) &Arg->Named.Name, Status); -Index: acpica-unix2-20161117/source/components/events/evgpeblk.c +Index: acpica-unix2-20161222/source/components/events/evgpeblk.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/events/evgpeblk.c -+++ acpica-unix2-20161117/source/components/events/evgpeblk.c +--- acpica-unix2-20161222.orig/source/components/events/evgpeblk.c ++++ acpica-unix2-20161222/source/components/events/evgpeblk.c @@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock ( ACPI_STATUS Status; ACPI_GPE_BLOCK_INFO *GpeBlock; @@ -3367,11 +3367,11 @@ Index: acpica-unix2-20161117/source/components/events/evgpeblk.c InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : "")); /* Update global count of currently available GPEs */ -Index: acpica-unix2-20161117/source/components/hardware/hwregs.c +Index: acpica-unix2-20161222/source/components/hardware/hwregs.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/hardware/hwregs.c -+++ acpica-unix2-20161117/source/components/hardware/hwregs.c -@@ -104,7 +104,7 @@ AcpiHwValidateRegister ( +--- acpica-unix2-20161222.orig/source/components/hardware/hwregs.c ++++ acpica-unix2-20161222/source/components/hardware/hwregs.c +@@ -197,7 +197,7 @@ AcpiHwValidateRegister ( * Address must not be null. A null address also indicates an optional * ACPI register that is not supported, so no error message. */ @@ -3380,10 +3380,10 @@ Index: acpica-unix2-20161117/source/components/hardware/hwregs.c if (!(*Address)) { return (AE_BAD_ADDRESS); -Index: acpica-unix2-20161117/source/components/hardware/hwvalid.c +Index: acpica-unix2-20161222/source/components/hardware/hwvalid.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/hardware/hwvalid.c -+++ acpica-unix2-20161117/source/components/hardware/hwvalid.c +--- acpica-unix2-20161222.orig/source/components/hardware/hwvalid.c ++++ acpica-unix2-20161222/source/components/hardware/hwvalid.c @@ -135,6 +135,8 @@ AcpiHwValidateIoRequest ( UINT32 ByteWidth; ACPI_IO_ADDRESS LastAddress; @@ -3405,10 +3405,10 @@ Index: acpica-unix2-20161117/source/components/hardware/hwvalid.c { ACPI_ERROR ((AE_INFO, "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X", -Index: acpica-unix2-20161117/source/components/namespace/nsaccess.c +Index: acpica-unix2-20161222/source/components/namespace/nsaccess.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/namespace/nsaccess.c -+++ acpica-unix2-20161117/source/components/namespace/nsaccess.c +--- acpica-unix2-20161222.orig/source/components/namespace/nsaccess.c ++++ acpica-unix2-20161222/source/components/namespace/nsaccess.c @@ -309,6 +309,7 @@ AcpiNsLookup ( ACPI_OBJECT_TYPE ThisSearchType; UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT; @@ -3429,10 +3429,10 @@ Index: acpica-unix2-20161117/source/components/namespace/nsaccess.c AcpiUtGetTypeName (ThisNode->Type), AcpiUtGetTypeName (TypeToCheckFor))); } -Index: acpica-unix2-20161117/source/components/namespace/nsparse.c +Index: acpica-unix2-20161222/source/components/namespace/nsparse.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/namespace/nsparse.c -+++ acpica-unix2-20161117/source/components/namespace/nsparse.c +--- acpica-unix2-20161222.orig/source/components/namespace/nsparse.c ++++ acpica-unix2-20161222/source/components/namespace/nsparse.c @@ -196,13 +196,14 @@ AcpiNsOneCompleteParse ( /* Table must consist of at least a complete header */ @@ -3450,10 +3450,10 @@ Index: acpica-unix2-20161117/source/components/namespace/nsparse.c Status = AcpiTbGetOwnerId (TableIndex, &OwnerId); if (ACPI_FAILURE (Status)) -Index: acpica-unix2-20161117/source/components/tables/tbdata.c +Index: acpica-unix2-20161222/source/components/tables/tbdata.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/tables/tbdata.c -+++ acpica-unix2-20161117/source/components/tables/tbdata.c +--- acpica-unix2-20161222.orig/source/components/tables/tbdata.c ++++ acpica-unix2-20161222/source/components/tables/tbdata.c @@ -407,6 +407,7 @@ AcpiTbVerifyTempTable ( char *Signature) { @@ -3472,10 +3472,10 @@ Index: acpica-unix2-20161117/source/components/tables/tbdata.c if (ACPI_FAILURE (Status)) { ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY, -Index: acpica-unix2-20161117/source/components/tables/tbfadt.c +Index: acpica-unix2-20161222/source/components/tables/tbfadt.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/tables/tbfadt.c -+++ acpica-unix2-20161117/source/components/tables/tbfadt.c +--- acpica-unix2-20161222.orig/source/components/tables/tbfadt.c ++++ acpica-unix2-20161222/source/components/tables/tbfadt.c @@ -520,6 +520,8 @@ AcpiTbConvertFadt ( UINT8 Length; UINT8 Flags; @@ -3555,10 +3555,10 @@ Index: acpica-unix2-20161117/source/components/tables/tbfadt.c "PmRegisters", 0); } } -Index: acpica-unix2-20161117/source/components/tables/tbfind.c +Index: acpica-unix2-20161222/source/components/tables/tbfind.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/tables/tbfind.c -+++ acpica-unix2-20161117/source/components/tables/tbfind.c +--- acpica-unix2-20161222.orig/source/components/tables/tbfind.c ++++ acpica-unix2-20161222/source/components/tables/tbfind.c @@ -108,8 +108,11 @@ AcpiTbFindTable ( (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES); for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i) @@ -3572,10 +3572,10 @@ Index: acpica-unix2-20161117/source/components/tables/tbfind.c { /* Not the requested table */ -Index: acpica-unix2-20161117/source/components/tables/tbprint.c +Index: acpica-unix2-20161222/source/components/tables/tbprint.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/tables/tbprint.c -+++ acpica-unix2-20161117/source/components/tables/tbprint.c +--- acpica-unix2-20161222.orig/source/components/tables/tbprint.c ++++ acpica-unix2-20161222/source/components/tables/tbprint.c @@ -143,15 +143,18 @@ AcpiTbPrintTableHeader ( ACPI_TABLE_HEADER *Header) { @@ -3617,10 +3617,10 @@ Index: acpica-unix2-20161117/source/components/tables/tbprint.c } } -Index: acpica-unix2-20161117/source/components/tables/tbutils.c +Index: acpica-unix2-20161222/source/components/tables/tbutils.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/tables/tbutils.c -+++ acpica-unix2-20161117/source/components/tables/tbutils.c +--- acpica-unix2-20161222.orig/source/components/tables/tbutils.c ++++ acpica-unix2-20161222/source/components/tables/tbutils.c @@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry ( * 64-bit platform, XSDT: Move (unaligned) 64-bit to local, * return 64-bit @@ -3680,10 +3680,10 @@ Index: acpica-unix2-20161117/source/components/tables/tbutils.c { AcpiGbl_FadtIndex = TableIndex; AcpiTbParseFadt (); -Index: acpica-unix2-20161117/source/components/tables/tbxface.c +Index: acpica-unix2-20161222/source/components/tables/tbxface.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/tables/tbxface.c -+++ acpica-unix2-20161117/source/components/tables/tbxface.c +--- acpica-unix2-20161222.orig/source/components/tables/tbxface.c ++++ acpica-unix2-20161222/source/components/tables/tbxface.c @@ -263,8 +263,11 @@ AcpiGetTableHeader ( for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++) @@ -3697,10 +3697,10 @@ Index: acpica-unix2-20161117/source/components/tables/tbxface.c { continue; } -Index: acpica-unix2-20161117/source/components/tables/tbxfload.c +Index: acpica-unix2-20161222/source/components/tables/tbxfload.c =================================================================== ---- acpica-unix2-20161117.orig/source/components/tables/tbxfload.c -+++ acpica-unix2-20161117/source/components/tables/tbxfload.c +--- acpica-unix2-20161222.orig/source/components/tables/tbxfload.c ++++ acpica-unix2-20161222/source/components/tables/tbxfload.c @@ -156,6 +156,7 @@ AcpiTbLoadNamespace ( ACPI_TABLE_DESC *Table; UINT32 TablesLoaded = 0; @@ -3720,10 +3720,10 @@ Index: acpica-unix2-20161117/source/components/tables/tbxfload.c ACPI_FAILURE (AcpiTbValidateTable (Table))) { Status = AE_NO_ACPI_TABLES; -Index: acpica-unix2-20161117/source/include/acmacros.h +Index: acpica-unix2-20161222/source/include/acmacros.h =================================================================== ---- acpica-unix2-20161117.orig/source/include/acmacros.h -+++ acpica-unix2-20161117/source/include/acmacros.h +--- acpica-unix2-20161222.orig/source/include/acmacros.h ++++ acpica-unix2-20161222/source/include/acmacros.h @@ -98,7 +98,9 @@ ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\ ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];} @@ -3787,11 +3787,11 @@ Index: acpica-unix2-20161117/source/include/acmacros.h #define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */ -Index: acpica-unix2-20161117/source/include/platform/aclinux.h +Index: acpica-unix2-20161222/source/include/platform/aclinux.h =================================================================== ---- acpica-unix2-20161117.orig/source/include/platform/aclinux.h -+++ acpica-unix2-20161117/source/include/platform/aclinux.h -@@ -210,6 +210,10 @@ +--- acpica-unix2-20161222.orig/source/include/platform/aclinux.h ++++ acpica-unix2-20161222/source/include/platform/aclinux.h +@@ -212,6 +212,10 @@ #define __cdecl #endif @@ -3802,10 +3802,10 @@ Index: acpica-unix2-20161117/source/include/platform/aclinux.h #endif /* __KERNEL__ */ #endif /* __ACLINUX_H__ */ -Index: acpica-unix2-20161117/source/tools/acpiexec/aetables.c +Index: acpica-unix2-20161222/source/tools/acpiexec/aetables.c =================================================================== ---- acpica-unix2-20161117.orig/source/tools/acpiexec/aetables.c -+++ acpica-unix2-20161117/source/tools/acpiexec/aetables.c +--- acpica-unix2-20161222.orig/source/tools/acpiexec/aetables.c ++++ acpica-unix2-20161222/source/tools/acpiexec/aetables.c @@ -146,21 +146,25 @@ AeInitializeTableHeader ( char *Signature, UINT32 Length)