Update to 20170728 upstream source and refresh patches

Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2017-08-11 17:49:03 -06:00
parent b60b74884b
commit 51a89eaabd
11 changed files with 232 additions and 239 deletions

2
.gitignore vendored
View File

@ -72,3 +72,5 @@
/acpitests-unix-20170531.tar.gz /acpitests-unix-20170531.tar.gz
/acpica-unix2-20170629.tar.gz /acpica-unix2-20170629.tar.gz
/acpitests-unix-20170629.tar.gz /acpitests-unix-20170629.tar.gz
/acpica-unix2-20170728.tar.gz
/acpitests-unix-20170728.tar.gz

View File

@ -1,7 +1,7 @@
Index: acpica-unix2-20170303/generate/unix/Makefile.config Index: acpica-unix2-20170728/generate/unix/Makefile.config
=================================================================== ===================================================================
--- acpica-unix2-20170303.orig/generate/unix/Makefile.config --- acpica-unix2-20170728.orig/generate/unix/Makefile.config
+++ acpica-unix2-20170303/generate/unix/Makefile.config +++ acpica-unix2-20170728/generate/unix/Makefile.config
@@ -23,6 +23,9 @@ @@ -23,6 +23,9 @@
# OPT_CFLAGS can be overridden on the make command line by # OPT_CFLAGS can be overridden on the make command line by
# adding OPT_CFLAGS="..." to the invocation. # adding OPT_CFLAGS="..." to the invocation.
@ -12,15 +12,6 @@ Index: acpica-unix2-20170303/generate/unix/Makefile.config
# Notes: # Notes:
# gcc should be version 4 or greater, otherwise some of the options # gcc should be version 4 or greater, otherwise some of the options
# used will not be recognized. # used will not be recognized.
@@ -43,7 +46,7 @@ CC = gcc
OBJDIR = obj
BINDIR = bin
COMPILEOBJ = $(CC) -c $(CFLAGS) $(OPT_CFLAGS) -o $@ $<
-LINKPROG = $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS)
+LINKPROG = $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS) $(OPT_LDFLAGS)
PREFIX ?= /usr
INSTALLDIR = $(PREFIX)/bin
UNAME_S := $(shell uname -s)
@@ -157,6 +160,11 @@ LDFLAGS +=-m32 @@ -157,6 +160,11 @@ LDFLAGS +=-m32
endif endif

View File

@ -1,5 +1,5 @@
Name: acpica-tools Name: acpica-tools
Version: 20170629 Version: 20170728
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
@ -194,6 +194,9 @@ fi
%changelog %changelog
* Fri Aug 11 2017 Al Stone <ahs3@redhat.com> - 20170728-1
- Update to 20170728 source tree, including patch refeshes
* Fri Aug 11 2017 Al Stone <ahs3@redhat.com> - 20170629-1 * Fri Aug 11 2017 Al Stone <ahs3@redhat.com> - 20170629-1
- Update to 20170629 source tree, including patch refeshes - Update to 20170629 source tree, including patch refeshes

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-20170629/source/compiler/aslcodegen.c Index: acpica-unix2-20170728/source/compiler/aslcodegen.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/compiler/aslcodegen.c --- acpica-unix2-20170728.orig/source/compiler/aslcodegen.c
+++ acpica-unix2-20170629/source/compiler/aslcodegen.c +++ acpica-unix2-20170728/source/compiler/aslcodegen.c
@@ -240,16 +240,12 @@ CgWriteAmlOpcode ( @@ -240,16 +240,12 @@ CgWriteAmlOpcode (
ACPI_PARSE_OBJECT *Op) ACPI_PARSE_OBJECT *Op)
{ {
@ -263,10 +263,10 @@ Index: acpica-unix2-20170629/source/compiler/aslcodegen.c
case AML_RAW_DATA_BUFFER: case AML_RAW_DATA_BUFFER:
Index: acpica-unix2-20170629/source/compiler/aslopcodes.c Index: acpica-unix2-20170728/source/compiler/aslopcodes.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/compiler/aslopcodes.c --- acpica-unix2-20170728.orig/source/compiler/aslopcodes.c
+++ acpica-unix2-20170629/source/compiler/aslopcodes.c +++ acpica-unix2-20170728/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-20170629/source/compiler/aslopcodes.c
} }
/* /*
Index: acpica-unix2-20170629/source/compiler/aslrestype1.c Index: acpica-unix2-20170728/source/compiler/aslrestype1.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/compiler/aslrestype1.c --- acpica-unix2-20170728.orig/source/compiler/aslrestype1.c
+++ acpica-unix2-20170629/source/compiler/aslrestype1.c +++ acpica-unix2-20170728/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-20170629/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-20170629/source/compiler/aslrestype1i.c Index: acpica-unix2-20170728/source/compiler/aslrestype1i.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/compiler/aslrestype1i.c --- acpica-unix2-20170728.orig/source/compiler/aslrestype1i.c
+++ acpica-unix2-20170629/source/compiler/aslrestype1i.c +++ acpica-unix2-20170728/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-20170629/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-20170629/source/compiler/aslrestype2.c Index: acpica-unix2-20170728/source/compiler/aslrestype2.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/compiler/aslrestype2.c --- acpica-unix2-20170728.orig/source/compiler/aslrestype2.c
+++ acpica-unix2-20170629/source/compiler/aslrestype2.c +++ acpica-unix2-20170728/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-20170629/source/compiler/aslrestype2.c
/* Point to end-of-descriptor for vendor data */ /* Point to end-of-descriptor for vendor data */
Index: acpica-unix2-20170629/source/compiler/aslrestype2d.c Index: acpica-unix2-20170728/source/compiler/aslrestype2d.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/compiler/aslrestype2d.c --- acpica-unix2-20170728.orig/source/compiler/aslrestype2d.c
+++ acpica-unix2-20170629/source/compiler/aslrestype2d.c +++ acpica-unix2-20170728/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-20170629/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-20170629/source/compiler/aslrestype2e.c Index: acpica-unix2-20170728/source/compiler/aslrestype2e.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/compiler/aslrestype2e.c --- acpica-unix2-20170728.orig/source/compiler/aslrestype2e.c
+++ acpica-unix2-20170629/source/compiler/aslrestype2e.c +++ acpica-unix2-20170728/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-20170629/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-20170629/source/compiler/aslrestype2q.c Index: acpica-unix2-20170728/source/compiler/aslrestype2q.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/compiler/aslrestype2q.c --- acpica-unix2-20170728.orig/source/compiler/aslrestype2q.c
+++ acpica-unix2-20170629/source/compiler/aslrestype2q.c +++ acpica-unix2-20170728/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-20170629/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-20170629/source/compiler/aslrestype2s.c Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/compiler/aslrestype2s.c --- acpica-unix2-20170728.orig/source/compiler/aslrestype2s.c
+++ acpica-unix2-20170629/source/compiler/aslrestype2s.c +++ acpica-unix2-20170728/source/compiler/aslrestype2s.c
@@ -340,6 +340,9 @@ RsDoGpioIntDescriptor ( @@ -340,6 +340,9 @@ RsDoGpioIntDescriptor (
UINT16 VendorLength; UINT16 VendorLength;
UINT16 InterruptLength; UINT16 InterruptLength;
@ -1852,10 +1852,10 @@ Index: acpica-unix2-20170629/source/compiler/aslrestype2s.c
MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
return (Rnode); return (Rnode);
} }
Index: acpica-unix2-20170629/source/compiler/aslrestype2w.c Index: acpica-unix2-20170728/source/compiler/aslrestype2w.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/compiler/aslrestype2w.c --- acpica-unix2-20170728.orig/source/compiler/aslrestype2w.c
+++ acpica-unix2-20170629/source/compiler/aslrestype2w.c +++ acpica-unix2-20170728/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-20170629/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-20170629/source/include/acmacros.h Index: acpica-unix2-20170728/source/include/acmacros.h
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/include/acmacros.h --- acpica-unix2-20170728.orig/source/include/acmacros.h
+++ acpica-unix2-20170629/source/include/acmacros.h +++ acpica-unix2-20170728/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-20170629/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-20170629/source/include/platform/aclinux.h Index: acpica-unix2-20170728/source/include/platform/aclinux.h
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/include/platform/aclinux.h --- acpica-unix2-20170728.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20170629/source/include/platform/aclinux.h +++ acpica-unix2-20170728/source/include/platform/aclinux.h
@@ -190,6 +190,7 @@ @@ -191,6 +191,7 @@
#ifdef ACPI_USE_STANDARD_HEADERS #ifdef ACPI_USE_STANDARD_HEADERS
#include <unistd.h> #include <unistd.h>

View File

@ -14,10 +14,10 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
source/include/actypes.h | 26 +++++++++++++------------- source/include/actypes.h | 26 +++++++++++++-------------
3 files changed, 32 insertions(+), 21 deletions(-) 3 files changed, 32 insertions(+), 21 deletions(-)
Index: acpica-unix2-20170531/source/components/executer/exoparg2.c Index: acpica-unix2-20170728/source/components/executer/exoparg2.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/components/executer/exoparg2.c --- acpica-unix2-20170728.orig/source/components/executer/exoparg2.c
+++ acpica-unix2-20170531/source/components/executer/exoparg2.c +++ acpica-unix2-20170728/source/components/executer/exoparg2.c
@@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R ( @@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R (
ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0];
ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL; ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL;
@ -58,10 +58,10 @@ Index: acpica-unix2-20170531/source/components/executer/exoparg2.c
break; break;
case AML_CONCATENATE_OP: /* Concatenate (Data1, Data2, Result) */ case AML_CONCATENATE_OP: /* Concatenate (Data1, Data2, Result) */
Index: acpica-unix2-20170531/source/include/actypes.h Index: acpica-unix2-20170728/source/include/actypes.h
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/include/actypes.h --- acpica-unix2-20170728.orig/source/include/actypes.h
+++ acpica-unix2-20170531/source/include/actypes.h +++ acpica-unix2-20170728/source/include/actypes.h
@@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64 @@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64
*/ */
#define ACPI_THREAD_ID UINT64 #define ACPI_THREAD_ID UINT64
@ -82,9 +82,9 @@ Index: acpica-unix2-20170531/source/include/actypes.h
/******************************************************************************* /*******************************************************************************
* *
@@ -169,20 +182,6 @@ typedef UINT64 @@ -170,20 +183,6 @@ typedef UINT64
#define ACPI_SIZE_MAX ACPI_UINT64_MAX
#define ACPI_USE_NATIVE_DIVIDE /* Has native 64-bit integer support */ #define ACPI_USE_NATIVE_DIVIDE /* Has native 64-bit integer support */
#define ACPI_USE_NATIVE_MATH64 /* Has native 64-bit integer support */
-/* -/*
- * In the case of the Itanium Processor Family (IPF), the hardware does not - * In the case of the Itanium Processor Family (IPF), the hardware does not

View File

@ -8,11 +8,11 @@ From: Al Stone <ahs3@redhat.com>
generate/unix/iasl/Makefile | 13 +++++++------ generate/unix/iasl/Makefile | 13 +++++++------
2 files changed, 9 insertions(+), 6 deletions(-) 2 files changed, 9 insertions(+), 6 deletions(-)
Index: acpica-unix2-20170629/generate/unix/Makefile.config Index: acpica-unix2-20170728/generate/unix/Makefile.config
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/generate/unix/Makefile.config --- acpica-unix2-20170728.orig/generate/unix/Makefile.config
+++ acpica-unix2-20170629/generate/unix/Makefile.config +++ acpica-unix2-20170728/generate/unix/Makefile.config
@@ -180,6 +180,8 @@ ifneq ($(NOFORTIFY),TRUE) @@ -182,6 +182,8 @@ ifneq ($(NOFORTIFY),TRUE)
OPT_CFLAGS += -D_FORTIFY_SOURCE=2 OPT_CFLAGS += -D_FORTIFY_SOURCE=2
endif endif
@ -21,11 +21,11 @@ Index: acpica-unix2-20170629/generate/unix/Makefile.config
CFLAGS += \ CFLAGS += \
-D$(HOST)\ -D$(HOST)\
-D_GNU_SOURCE\ -D_GNU_SOURCE\
Index: acpica-unix2-20170629/generate/unix/iasl/Makefile Index: acpica-unix2-20170728/generate/unix/iasl/Makefile
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/generate/unix/iasl/Makefile --- acpica-unix2-20170728.orig/generate/unix/iasl/Makefile
+++ acpica-unix2-20170629/generate/unix/iasl/Makefile +++ acpica-unix2-20170728/generate/unix/iasl/Makefile
@@ -334,26 +334,27 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa @@ -335,26 +335,27 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
# Cannot use the common compile warning flags since the C files are created # 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. # by the utilities above and they are not necessarily ANSI C, etc.
# #

View File

@ -76,9 +76,6 @@ Warning 3144 - Method Local is set but never used
grammar.asl 913: Device (DEV1) grammar.asl 913: Device (DEV1)
Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
grammar.asl 949: Method (_ERR, 2)
Warning 3102 - ^ Reserved method has too few arguments (_ERR requires 3)
grammar.asl 963: Divide (Local0, Local1, Local3) grammar.asl 963: Divide (Local0, Local1, Local3)
Warning 3144 - Method Local is set but never used ^ (Local3) Warning 3144 - Method Local is set but never used ^ (Local3)
@ -374,4 +371,4 @@ Ignoring all errors, forcing AML file generation
ASL Input: grammar.asl - 10285 lines, 323667 bytes, 4818 keywords ASL Input: grammar.asl - 10285 lines, 323667 bytes, 4818 keywords
AML Output: grammar.aml - 43758 bytes, 670 named objects, 4148 executable opcodes AML Output: grammar.aml - 43758 bytes, 670 named objects, 4148 executable opcodes
Compilation complete. 6 Errors, 89 Warnings, 27 Remarks, 1106 Optimizations Compilation complete. 6 Errors, 88 Warnings, 27 Remarks, 1106 Optimizations

View File

@ -24,11 +24,11 @@ From: Al Stone <ahs3@redhat.com>
source/tools/acpiexec/aemain.c | 2 +- source/tools/acpiexec/aemain.c | 2 +-
18 files changed, 28 insertions(+), 28 deletions(-) 18 files changed, 28 insertions(+), 28 deletions(-)
Index: acpica-unix2-20170531/source/compiler/aslcompile.c Index: acpica-unix2-20170728/source/compiler/aslcompile.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslcompile.c --- acpica-unix2-20170728.orig/source/compiler/aslcompile.c
+++ acpica-unix2-20170531/source/compiler/aslcompile.c +++ acpica-unix2-20170728/source/compiler/aslcompile.c
@@ -750,7 +750,7 @@ CmCleanupAndExit ( @@ -751,7 +751,7 @@ CmCleanupAndExit (
if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
{ {
@ -37,11 +37,11 @@ Index: acpica-unix2-20170531/source/compiler/aslcompile.c
ASL_MAX_ERROR_COUNT); ASL_MAX_ERROR_COUNT);
} }
Index: acpica-unix2-20170531/source/compiler/aslerror.c Index: acpica-unix2-20170728/source/compiler/aslerror.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslerror.c --- acpica-unix2-20170728.orig/source/compiler/aslerror.c
+++ acpica-unix2-20170531/source/compiler/aslerror.c +++ acpica-unix2-20170728/source/compiler/aslerror.c
@@ -687,7 +687,7 @@ AslCommonError ( @@ -697,7 +697,7 @@ AslCommonError (
Gbl_ExceptionCount[Level]++; Gbl_ExceptionCount[Level]++;
if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
{ {
@ -50,7 +50,7 @@ Index: acpica-unix2-20170531/source/compiler/aslerror.c
Gbl_SourceLine = 0; Gbl_SourceLine = 0;
Gbl_NextError = Gbl_ErrorLog; Gbl_NextError = Gbl_ErrorLog;
@@ -733,7 +733,7 @@ AslDisableException ( @@ -852,7 +852,7 @@ AslDisableException (
if (Gbl_DisabledMessagesIndex >= ASL_MAX_DISABLED_MESSAGES) if (Gbl_DisabledMessagesIndex >= ASL_MAX_DISABLED_MESSAGES)
{ {
@ -59,10 +59,10 @@ Index: acpica-unix2-20170531/source/compiler/aslerror.c
ASL_MAX_DISABLED_MESSAGES); ASL_MAX_DISABLED_MESSAGES);
return (AE_LIMIT); return (AE_LIMIT);
} }
Index: acpica-unix2-20170531/source/compiler/aslopt.c Index: acpica-unix2-20170728/source/compiler/aslopt.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslopt.c --- acpica-unix2-20170728.orig/source/compiler/aslopt.c
+++ acpica-unix2-20170531/source/compiler/aslopt.c +++ acpica-unix2-20170728/source/compiler/aslopt.c
@@ -584,7 +584,7 @@ OptOptimizeNamePath ( @@ -584,7 +584,7 @@ OptOptimizeNamePath (
} }
@ -72,10 +72,10 @@ Index: acpica-unix2-20170531/source/compiler/aslopt.c
Op->Asl.LogicalLineNumber, Op->Asl.LogicalLineNumber,
AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode), AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
AcpiPsGetOpcodeName (Op->Common.AmlOpcode))); AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
Index: acpica-unix2-20170531/source/compiler/aslpredef.c Index: acpica-unix2-20170728/source/compiler/aslpredef.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslpredef.c --- acpica-unix2-20170728.orig/source/compiler/aslpredef.c
+++ acpica-unix2-20170531/source/compiler/aslpredef.c +++ acpica-unix2-20170728/source/compiler/aslpredef.c
@@ -114,7 +114,7 @@ ApCheckForPredefinedMethod ( @@ -114,7 +114,7 @@ ApCheckForPredefinedMethod (
if (MethodInfo->NumArguments != 0) if (MethodInfo->NumArguments != 0)
@ -85,10 +85,10 @@ Index: acpica-unix2-20170531/source/compiler/aslpredef.c
AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op, AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op,
MsgBuffer); MsgBuffer);
Index: acpica-unix2-20170531/source/compiler/aslprepkg.c Index: acpica-unix2-20170728/source/compiler/aslprepkg.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslprepkg.c --- acpica-unix2-20170728.orig/source/compiler/aslprepkg.c
+++ acpica-unix2-20170531/source/compiler/aslprepkg.c +++ acpica-unix2-20170728/source/compiler/aslprepkg.c
@@ -309,7 +309,7 @@ ApCheckPackage ( @@ -309,7 +309,7 @@ ApCheckPackage (
if (Count & 1) if (Count & 1)
@ -98,10 +98,10 @@ Index: acpica-unix2-20170531/source/compiler/aslprepkg.c
Predefined->Info.Name, Count); Predefined->Info.Name, Count);
AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH, AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
Index: acpica-unix2-20170531/source/components/debugger/dbexec.c Index: acpica-unix2-20170728/source/components/debugger/dbexec.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/components/debugger/dbexec.c --- acpica-unix2-20170728.orig/source/components/debugger/dbexec.c
+++ acpica-unix2-20170531/source/components/debugger/dbexec.c +++ acpica-unix2-20170728/source/components/debugger/dbexec.c
@@ -226,7 +226,7 @@ AcpiDbExecuteMethod ( @@ -226,7 +226,7 @@ AcpiDbExecuteMethod (
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
"Possible overflow of internal debugger " "Possible overflow of internal debugger "
@ -111,10 +111,10 @@ Index: acpica-unix2-20170531/source/components/debugger/dbexec.c
} }
} }
Index: acpica-unix2-20170531/source/components/dispatcher/dsmthdat.c Index: acpica-unix2-20170728/source/components/dispatcher/dsmthdat.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/components/dispatcher/dsmthdat.c --- acpica-unix2-20170728.orig/source/components/dispatcher/dsmthdat.c
+++ acpica-unix2-20170531/source/components/dispatcher/dsmthdat.c +++ acpica-unix2-20170728/source/components/dispatcher/dsmthdat.c
@@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode ( @@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
if (Index > ACPI_METHOD_MAX_LOCAL) if (Index > ACPI_METHOD_MAX_LOCAL)
{ {
@ -133,10 +133,10 @@ Index: acpica-unix2-20170531/source/components/dispatcher/dsmthdat.c
Index, ACPI_METHOD_MAX_ARG)); Index, ACPI_METHOD_MAX_ARG));
return_ACPI_STATUS (AE_AML_INVALID_INDEX); return_ACPI_STATUS (AE_AML_INVALID_INDEX);
} }
Index: acpica-unix2-20170531/source/components/dispatcher/dsutils.c Index: acpica-unix2-20170728/source/components/dispatcher/dsutils.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/components/dispatcher/dsutils.c --- acpica-unix2-20170728.orig/source/components/dispatcher/dsutils.c
+++ acpica-unix2-20170531/source/components/dispatcher/dsutils.c +++ acpica-unix2-20170728/source/components/dispatcher/dsutils.c
@@ -787,7 +787,7 @@ AcpiDsCreateOperands ( @@ -787,7 +787,7 @@ AcpiDsCreateOperands (
} }
@ -146,10 +146,10 @@ Index: acpica-unix2-20170531/source/components/dispatcher/dsutils.c
WalkState->NumOperands, ArgCount, Index)); WalkState->NumOperands, ArgCount, Index));
/* Create the interpreter arguments, in reverse order */ /* Create the interpreter arguments, in reverse order */
Index: acpica-unix2-20170531/source/components/dispatcher/dswscope.c Index: acpica-unix2-20170728/source/components/dispatcher/dswscope.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/components/dispatcher/dswscope.c --- acpica-unix2-20170728.orig/source/components/dispatcher/dswscope.c
+++ acpica-unix2-20170531/source/components/dispatcher/dswscope.c +++ acpica-unix2-20170728/source/components/dispatcher/dswscope.c
@@ -149,7 +149,7 @@ AcpiDsScopeStackPush ( @@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
WalkState->ScopeDepth++; WalkState->ScopeDepth++;
@ -168,10 +168,10 @@ Index: acpica-unix2-20170531/source/components/dispatcher/dswscope.c
(UINT32) WalkState->ScopeDepth, (UINT32) WalkState->ScopeDepth,
AcpiUtGetNodeName (ScopeInfo->Scope.Node), AcpiUtGetNodeName (ScopeInfo->Scope.Node),
AcpiUtGetTypeName (ScopeInfo->Common.Value))); AcpiUtGetTypeName (ScopeInfo->Common.Value)));
Index: acpica-unix2-20170531/source/components/events/evgpe.c Index: acpica-unix2-20170728/source/components/events/evgpe.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/components/events/evgpe.c --- acpica-unix2-20170728.orig/source/components/events/evgpe.c
+++ acpica-unix2-20170531/source/components/events/evgpe.c +++ acpica-unix2-20170728/source/components/events/evgpe.c
@@ -494,7 +494,7 @@ AcpiEvGpeDetect ( @@ -494,7 +494,7 @@ AcpiEvGpeDetect (
"Ignore disabled registers for GPE %02X-%02X: " "Ignore disabled registers for GPE %02X-%02X: "
"RunEnable=%02X, WakeEnable=%02X\n", "RunEnable=%02X, WakeEnable=%02X\n",
@ -190,11 +190,11 @@ Index: acpica-unix2-20170531/source/components/events/evgpe.c
StatusReg, EnableReg, StatusReg, EnableReg,
GpeRegisterInfo->EnableForRun, GpeRegisterInfo->EnableForRun,
GpeRegisterInfo->EnableForWake)); GpeRegisterInfo->EnableForWake));
Index: acpica-unix2-20170531/source/components/executer/exdump.c Index: acpica-unix2-20170728/source/components/executer/exdump.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/components/executer/exdump.c --- acpica-unix2-20170728.orig/source/components/executer/exdump.c
+++ acpica-unix2-20170531/source/components/executer/exdump.c +++ acpica-unix2-20170728/source/components/executer/exdump.c
@@ -668,7 +668,7 @@ AcpiExDumpOperand ( @@ -678,7 +678,7 @@ AcpiExDumpOperand (
if (Depth > 0) if (Depth > 0)
{ {
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%*s[%u] %p Refs=%u ", ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%*s[%u] %p Refs=%u ",
@ -203,10 +203,10 @@ Index: acpica-unix2-20170531/source/components/executer/exdump.c
} }
else else
{ {
Index: acpica-unix2-20170531/source/components/executer/exfldio.c Index: acpica-unix2-20170728/source/components/executer/exfldio.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/components/executer/exfldio.c --- acpica-unix2-20170728.orig/source/components/executer/exfldio.c
+++ acpica-unix2-20170531/source/components/executer/exfldio.c +++ acpica-unix2-20170728/source/components/executer/exfldio.c
@@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule ( @@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
@ -218,10 +218,10 @@ Index: acpica-unix2-20170531/source/components/executer/exfldio.c
return_ACPI_STATUS (AE_AML_OPERAND_VALUE); return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
} }
} }
Index: acpica-unix2-20170531/source/components/executer/exnames.c Index: acpica-unix2-20170728/source/components/executer/exnames.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/components/executer/exnames.c --- acpica-unix2-20170728.orig/source/components/executer/exnames.c
+++ acpica-unix2-20170531/source/components/executer/exnames.c +++ acpica-unix2-20170728/source/components/executer/exnames.c
@@ -240,7 +240,7 @@ AcpiExNameSegment ( @@ -240,7 +240,7 @@ AcpiExNameSegment (
*/ */
ACPI_DEBUG_PRINT ((ACPI_DB_INFO, ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
@ -240,10 +240,10 @@ Index: acpica-unix2-20170531/source/components/executer/exnames.c
} }
*InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress); *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
Index: acpica-unix2-20170531/source/components/hardware/hwregs.c Index: acpica-unix2-20170728/source/components/hardware/hwregs.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/components/hardware/hwregs.c --- acpica-unix2-20170728.orig/source/components/hardware/hwregs.c
+++ acpica-unix2-20170531/source/components/hardware/hwregs.c +++ acpica-unix2-20170728/source/components/hardware/hwregs.c
@@ -464,7 +464,7 @@ AcpiHwClearAcpiStatus ( @@ -464,7 +464,7 @@ AcpiHwClearAcpiStatus (
@ -253,10 +253,10 @@ Index: acpica-unix2-20170531/source/components/hardware/hwregs.c
ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address))); ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock); LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
Index: acpica-unix2-20170531/source/components/tables/tbfadt.c Index: acpica-unix2-20170728/source/components/tables/tbfadt.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/components/tables/tbfadt.c --- acpica-unix2-20170728.orig/source/components/tables/tbfadt.c
+++ acpica-unix2-20170531/source/components/tables/tbfadt.c +++ acpica-unix2-20170728/source/components/tables/tbfadt.c
@@ -233,7 +233,7 @@ AcpiTbInitGenericAddress ( @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
if (!(Flags & ACPI_FADT_GPE_REGISTER)) if (!(Flags & ACPI_FADT_GPE_REGISTER))
{ {
@ -284,10 +284,10 @@ Index: acpica-unix2-20170531/source/components/tables/tbfadt.c
Name, Address32, Name, Address32,
ACPI_FORMAT_UINT64 (Address64->Address), ACPI_FORMAT_UINT64 (Address64->Address),
AcpiGbl_Use32BitFadtAddresses ? 32 : 64)); AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
Index: acpica-unix2-20170531/source/components/tables/tbxfroot.c Index: acpica-unix2-20170728/source/components/tables/tbxfroot.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/components/tables/tbxfroot.c --- acpica-unix2-20170728.orig/source/components/tables/tbxfroot.c
+++ acpica-unix2-20170531/source/components/tables/tbxfroot.c +++ acpica-unix2-20170728/source/components/tables/tbxfroot.c
@@ -177,7 +177,7 @@ AcpiFindRootPointer ( @@ -177,7 +177,7 @@ AcpiFindRootPointer (
{ {
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
@ -315,10 +315,10 @@ Index: acpica-unix2-20170531/source/components/tables/tbxfroot.c
return_ACPI_STATUS (AE_NO_MEMORY); return_ACPI_STATUS (AE_NO_MEMORY);
} }
Index: acpica-unix2-20170531/source/components/utilities/utownerid.c Index: acpica-unix2-20170728/source/components/utilities/utownerid.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/components/utilities/utownerid.c --- acpica-unix2-20170728.orig/source/components/utilities/utownerid.c
+++ acpica-unix2-20170531/source/components/utilities/utownerid.c +++ acpica-unix2-20170728/source/components/utilities/utownerid.c
@@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId ( @@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
else else
{ {
@ -328,10 +328,10 @@ Index: acpica-unix2-20170531/source/components/utilities/utownerid.c
} }
(void) AcpiUtReleaseMutex (ACPI_MTX_CACHES); (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES);
Index: acpica-unix2-20170531/source/tools/acpiexec/aemain.c Index: acpica-unix2-20170728/source/tools/acpiexec/aemain.c
=================================================================== ===================================================================
--- acpica-unix2-20170531.orig/source/tools/acpiexec/aemain.c --- acpica-unix2-20170728.orig/source/tools/acpiexec/aemain.c
+++ acpica-unix2-20170531/source/tools/acpiexec/aemain.c +++ acpica-unix2-20170728/source/tools/acpiexec/aemain.c
@@ -203,7 +203,7 @@ AeDoOptions ( @@ -203,7 +203,7 @@ AeDoOptions (
if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1)) if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1))

View File

@ -1,8 +1,8 @@
Index: acpica-unix2-20170629/source/include/platform/aclinux.h Index: acpica-unix2-20170728/source/include/platform/aclinux.h
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/include/platform/aclinux.h --- acpica-unix2-20170728.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20170629/source/include/platform/aclinux.h +++ acpica-unix2-20170728/source/include/platform/aclinux.h
@@ -224,9 +224,11 @@ @@ -226,9 +226,11 @@
#define __cdecl #define __cdecl
#endif #endif

View File

@ -1,2 +1,2 @@
SHA512 (acpica-unix2-20170629.tar.gz) = acbfcb02e48634bbde8143a5c420504bed385d4ab01027d5a8de60a3e49d007d1bfa699544ffa4e0a3b04d03821896e5fe4a852b3ca2b2976afe7c290b3eac1d SHA512 (acpica-unix2-20170728.tar.gz) = 6d66a733016c291443e3b0355191b287eafb3ead9da9fec154e6c1d15a4c73bb2542e8262754b313004132f0a1bfc421d31c5fa77aa3272ae2ef967bb256ca4e
SHA512 (acpitests-unix-20170629.tar.gz) = ec310cd24feafc28a749d635a7527c468cbbbeb80eb4b3d15dbf551014557b619856c6de585bd9f828cce591815e974fca6d71ab98a16eec414c606dc1792496 SHA512 (acpitests-unix-20170728.tar.gz) = 1e0fdb4fc12cd1ef60bf10712a211089fac3986cf58b0b1188888fb33f53af904ee9b1178e154b11a82c08bb185f92ac7efee6915351326193376f8e64bf4a81

View File

@ -1,7 +1,7 @@
Index: acpica-unix2-20170629/source/common/acfileio.c Index: acpica-unix2-20170728/source/common/acfileio.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/common/acfileio.c --- acpica-unix2-20170728.orig/source/common/acfileio.c
+++ acpica-unix2-20170629/source/common/acfileio.c +++ acpica-unix2-20170728/source/common/acfileio.c
@@ -280,6 +280,7 @@ AcGetOneTableFromFile ( @@ -280,6 +280,7 @@ AcGetOneTableFromFile (
ACPI_TABLE_HEADER *Table; ACPI_TABLE_HEADER *Table;
INT32 Count; INT32 Count;
@ -63,11 +63,11 @@ Index: acpica-unix2-20170629/source/common/acfileio.c
(UINT32) (FileSize - TableOffset)); (UINT32) (FileSize - TableOffset));
return (AE_BAD_HEADER); return (AE_BAD_HEADER);
} }
Index: acpica-unix2-20170629/source/common/dmtable.c Index: acpica-unix2-20170728/source/common/dmtable.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/common/dmtable.c --- acpica-unix2-20170728.orig/source/common/dmtable.c
+++ acpica-unix2-20170629/source/common/dmtable.c +++ acpica-unix2-20170728/source/common/dmtable.c
@@ -523,7 +523,7 @@ AcpiDmDumpDataTable ( @@ -524,7 +524,7 @@ AcpiDmDumpDataTable (
*/ */
if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS)) if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS))
{ {
@ -76,7 +76,7 @@ Index: acpica-unix2-20170629/source/common/dmtable.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs); Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -537,13 +537,14 @@ AcpiDmDumpDataTable ( @@ -538,13 +538,14 @@ AcpiDmDumpDataTable (
else if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_S3PT)) else if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_S3PT))
{ {
Length = AcpiDmDumpS3pt (Table); Length = AcpiDmDumpS3pt (Table);
@ -92,7 +92,7 @@ Index: acpica-unix2-20170629/source/common/dmtable.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader); Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -754,6 +755,7 @@ AcpiDmDumpTable ( @@ -755,6 +756,7 @@ AcpiDmDumpTable (
BOOLEAN LastOutputBlankLine = FALSE; BOOLEAN LastOutputBlankLine = FALSE;
ACPI_STATUS Status; ACPI_STATUS Status;
char RepairedName[8]; char RepairedName[8];
@ -100,7 +100,7 @@ Index: acpica-unix2-20170629/source/common/dmtable.c
if (!Info) if (!Info)
@@ -1148,8 +1150,9 @@ AcpiDmDumpTable ( @@ -1149,8 +1151,9 @@ AcpiDmDumpTable (
/* Checksum, display and validate */ /* Checksum, display and validate */
AcpiOsPrintf ("%2.2X", *Target); AcpiOsPrintf ("%2.2X", *Target);
@ -112,7 +112,7 @@ Index: acpica-unix2-20170629/source/common/dmtable.c
ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum); ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum);
if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum) if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum)
@@ -1214,14 +1217,14 @@ AcpiDmDumpTable ( @@ -1215,14 +1218,14 @@ AcpiDmDumpTable (
/* DMAR subtable types */ /* DMAR subtable types */
@ -130,7 +130,7 @@ Index: acpica-unix2-20170629/source/common/dmtable.c
break; break;
case ACPI_DMT_DMAR_SCOPE: case ACPI_DMT_DMAR_SCOPE:
@@ -1312,14 +1315,14 @@ AcpiDmDumpTable ( @@ -1313,14 +1316,14 @@ AcpiDmDumpTable (
/* HEST subtable types */ /* HEST subtable types */
@ -148,7 +148,7 @@ Index: acpica-unix2-20170629/source/common/dmtable.c
break; break;
case ACPI_DMT_HESTNTFY: case ACPI_DMT_HESTNTFY:
@@ -1399,13 +1402,14 @@ AcpiDmDumpTable ( @@ -1400,13 +1403,14 @@ AcpiDmDumpTable (
/* NFIT subtable types */ /* NFIT subtable types */
@ -165,10 +165,10 @@ Index: acpica-unix2-20170629/source/common/dmtable.c
AcpiDmNfitSubnames[Temp16]); AcpiDmNfitSubnames[Temp16]);
break; break;
Index: acpica-unix2-20170629/source/common/dmtables.c Index: acpica-unix2-20170728/source/common/dmtables.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/common/dmtables.c --- acpica-unix2-20170728.orig/source/common/dmtables.c
+++ acpica-unix2-20170629/source/common/dmtables.c +++ acpica-unix2-20170728/source/common/dmtables.c
@@ -142,7 +142,9 @@ AdCreateTableHeader ( @@ -142,7 +142,9 @@ AdCreateTableHeader (
ACPI_TABLE_HEADER *Table) ACPI_TABLE_HEADER *Table)
{ {
@ -234,10 +234,10 @@ Index: acpica-unix2-20170629/source/common/dmtables.c
AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)); AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength); ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
Index: acpica-unix2-20170629/source/common/dmtbdump.c Index: acpica-unix2-20170728/source/common/dmtbdump.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/common/dmtbdump.c --- acpica-unix2-20170728.orig/source/common/dmtbdump.c
+++ acpica-unix2-20170629/source/common/dmtbdump.c +++ acpica-unix2-20170728/source/common/dmtbdump.c
@@ -277,6 +277,8 @@ AcpiDmDumpRsdt ( @@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
UINT32 Entries; UINT32 Entries;
UINT32 Offset; UINT32 Offset;
@ -2051,10 +2051,10 @@ Index: acpica-unix2-20170629/source/common/dmtbdump.c
+ (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength, + (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
AcpiDmTableInfoWpbt0); AcpiDmTableInfoWpbt0);
} }
Index: acpica-unix2-20170629/source/compiler/aslrestype2.c Index: acpica-unix2-20170728/source/compiler/aslrestype2.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/compiler/aslrestype2.c --- acpica-unix2-20170728.orig/source/compiler/aslrestype2.c
+++ acpica-unix2-20170629/source/compiler/aslrestype2.c +++ acpica-unix2-20170728/source/compiler/aslrestype2.c
@@ -98,21 +98,33 @@ RsDoGeneralRegisterDescriptor ( @@ -98,21 +98,33 @@ RsDoGeneralRegisterDescriptor (
{ {
case 0: /* Address space */ case 0: /* Address space */
@ -2101,10 +2101,10 @@ Index: acpica-unix2-20170629/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-20170629/source/compiler/dtfield.c Index: acpica-unix2-20170728/source/compiler/dtfield.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/compiler/dtfield.c --- acpica-unix2-20170728.orig/source/compiler/dtfield.c
+++ acpica-unix2-20170629/source/compiler/dtfield.c +++ acpica-unix2-20170728/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);
} }
@ -2134,10 +2134,10 @@ Index: acpica-unix2-20170629/source/compiler/dtfield.c
return; return;
} }
Index: acpica-unix2-20170629/source/compiler/dtsubtable.c Index: acpica-unix2-20170728/source/compiler/dtsubtable.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/compiler/dtsubtable.c --- acpica-unix2-20170728.orig/source/compiler/dtsubtable.c
+++ acpica-unix2-20170629/source/compiler/dtsubtable.c +++ acpica-unix2-20170728/source/compiler/dtsubtable.c
@@ -379,6 +379,21 @@ DtSetSubtableLength ( @@ -379,6 +379,21 @@ DtSetSubtableLength (
return; return;
} }
@ -2162,10 +2162,10 @@ Index: acpica-unix2-20170629/source/compiler/dtsubtable.c
+ Subtable->SizeOfLengthField); + Subtable->SizeOfLengthField);
+ } + }
} }
Index: acpica-unix2-20170629/source/compiler/dttable1.c Index: acpica-unix2-20170728/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/compiler/dttable1.c --- acpica-unix2-20170728.orig/source/compiler/dttable1.c
+++ acpica-unix2-20170629/source/compiler/dttable1.c +++ acpica-unix2-20170728/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;
@ -2539,10 +2539,10 @@ Index: acpica-unix2-20170629/source/compiler/dttable1.c
return (AE_OK); return (AE_OK);
} }
Index: acpica-unix2-20170629/source/compiler/dttable2.c Index: acpica-unix2-20170728/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/compiler/dttable2.c --- acpica-unix2-20170728.orig/source/compiler/dttable2.c
+++ acpica-unix2-20170629/source/compiler/dttable2.c +++ acpica-unix2-20170728/source/compiler/dttable2.c
@@ -346,7 +346,7 @@ DtCompileMpst ( @@ -346,7 +346,7 @@ DtCompileMpst (
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
@ -2699,10 +2699,10 @@ Index: acpica-unix2-20170629/source/compiler/dttable2.c
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
Index: acpica-unix2-20170629/source/components/disassembler/dmbuffer.c Index: acpica-unix2-20170728/source/components/disassembler/dmbuffer.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/disassembler/dmbuffer.c --- acpica-unix2-20170728.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix2-20170629/source/components/disassembler/dmbuffer.c +++ acpica-unix2-20170728/source/components/disassembler/dmbuffer.c
@@ -204,7 +204,7 @@ AcpiDmByteList ( @@ -204,7 +204,7 @@ AcpiDmByteList (
@ -2778,10 +2778,10 @@ Index: acpica-unix2-20170629/source/components/disassembler/dmbuffer.c
NextOp = AcpiPsGetDepthNext (NULL, Op); NextOp = AcpiPsGetDepthNext (NULL, Op);
if (!NextOp) if (!NextOp)
Index: acpica-unix2-20170629/source/components/disassembler/dmopcode.c Index: acpica-unix2-20170728/source/components/disassembler/dmopcode.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/disassembler/dmopcode.c --- acpica-unix2-20170728.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix2-20170629/source/components/disassembler/dmopcode.c +++ acpica-unix2-20170728/source/components/disassembler/dmopcode.c
@@ -244,6 +244,7 @@ AcpiDmPredefinedDescription ( @@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
char *NameString; char *NameString;
int LastCharIsDigit; int LastCharIsDigit;
@ -2836,10 +2836,10 @@ Index: acpica-unix2-20170629/source/components/disassembler/dmopcode.c
Info->BitOffset += Offset; Info->BitOffset += Offset;
if (Info->BitOffset % 8 == 0) if (Info->BitOffset % 8 == 0)
Index: acpica-unix2-20170629/source/components/disassembler/dmresrcl2.c Index: acpica-unix2-20170728/source/components/disassembler/dmresrcl2.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/disassembler/dmresrcl2.c --- acpica-unix2-20170728.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix2-20170629/source/components/disassembler/dmresrcl2.c +++ acpica-unix2-20170728/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;
@ -3061,10 +3061,10 @@ Index: acpica-unix2-20170629/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-20170629/source/components/disassembler/dmresrcl.c Index: acpica-unix2-20170728/source/components/disassembler/dmresrcl.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/disassembler/dmresrcl.c --- acpica-unix2-20170728.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix2-20170629/source/components/disassembler/dmresrcl.c +++ acpica-unix2-20170728/source/components/disassembler/dmresrcl.c
@@ -141,7 +141,8 @@ AcpiDmMemoryFields ( @@ -141,7 +141,8 @@ AcpiDmMemoryFields (
UINT32 Level) UINT32 Level)
{ {
@ -3213,10 +3213,10 @@ Index: acpica-unix2-20170629/source/components/disassembler/dmresrcl.c
} }
AcpiDmIndent (Level); AcpiDmIndent (Level);
Index: acpica-unix2-20170629/source/components/disassembler/dmresrcs.c Index: acpica-unix2-20170728/source/components/disassembler/dmresrcs.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/disassembler/dmresrcs.c --- acpica-unix2-20170728.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix2-20170629/source/components/disassembler/dmresrcs.c +++ acpica-unix2-20170728/source/components/disassembler/dmresrcs.c
@@ -72,6 +72,7 @@ AcpiDmIrqDescriptor ( @@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
UINT32 Length, UINT32 Length,
UINT32 Level) UINT32 Level)
@ -3273,11 +3273,11 @@ Index: acpica-unix2-20170629/source/components/disassembler/dmresrcs.c
AcpiDmIndent (Level + 1); AcpiDmIndent (Level + 1);
AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length"); AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
Index: acpica-unix2-20170629/source/components/dispatcher/dsfield.c Index: acpica-unix2-20170728/source/components/dispatcher/dsfield.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/dispatcher/dsfield.c --- acpica-unix2-20170728.orig/source/components/dispatcher/dsfield.c
+++ acpica-unix2-20170629/source/components/dispatcher/dsfield.c +++ acpica-unix2-20170728/source/components/dispatcher/dsfield.c
@@ -318,6 +318,7 @@ AcpiDsGetFieldNames ( @@ -320,6 +320,7 @@ AcpiDsGetFieldNames (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT64 Position; UINT64 Position;
ACPI_PARSE_OBJECT *Child; ACPI_PARSE_OBJECT *Child;
@ -3285,7 +3285,7 @@ Index: acpica-unix2-20170629/source/components/dispatcher/dsfield.c
ACPI_FUNCTION_TRACE_PTR (DsGetFieldNames, Info); ACPI_FUNCTION_TRACE_PTR (DsGetFieldNames, Info);
@@ -424,10 +425,17 @@ AcpiDsGetFieldNames ( @@ -426,10 +427,17 @@ AcpiDsGetFieldNames (
/* Lookup the name, it should already exist */ /* Lookup the name, it should already exist */
@ -3303,7 +3303,7 @@ Index: acpica-unix2-20170629/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);
@@ -652,9 +660,17 @@ AcpiDsInitFieldObjects ( @@ -656,9 +664,17 @@ AcpiDsInitFieldObjects (
*/ */
if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP) if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
{ {
@ -3321,10 +3321,10 @@ Index: acpica-unix2-20170629/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-20170629/source/components/events/evgpeblk.c Index: acpica-unix2-20170728/source/components/events/evgpeblk.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/events/evgpeblk.c --- acpica-unix2-20170728.orig/source/components/events/evgpeblk.c
+++ acpica-unix2-20170629/source/components/events/evgpeblk.c +++ acpica-unix2-20170728/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;
@ -3357,10 +3357,10 @@ Index: acpica-unix2-20170629/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-20170629/source/components/hardware/hwregs.c Index: acpica-unix2-20170728/source/components/hardware/hwregs.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/hardware/hwregs.c --- acpica-unix2-20170728.orig/source/components/hardware/hwregs.c
+++ acpica-unix2-20170629/source/components/hardware/hwregs.c +++ acpica-unix2-20170728/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.
@ -3370,10 +3370,10 @@ Index: acpica-unix2-20170629/source/components/hardware/hwregs.c
if (!(*Address)) if (!(*Address))
{ {
return (AE_BAD_ADDRESS); return (AE_BAD_ADDRESS);
Index: acpica-unix2-20170629/source/components/hardware/hwvalid.c Index: acpica-unix2-20170728/source/components/hardware/hwvalid.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/hardware/hwvalid.c --- acpica-unix2-20170728.orig/source/components/hardware/hwvalid.c
+++ acpica-unix2-20170629/source/components/hardware/hwvalid.c +++ acpica-unix2-20170728/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;
@ -3395,11 +3395,11 @@ Index: acpica-unix2-20170629/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-20170629/source/components/namespace/nsaccess.c Index: acpica-unix2-20170728/source/components/namespace/nsaccess.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/namespace/nsaccess.c --- acpica-unix2-20170728.orig/source/components/namespace/nsaccess.c
+++ acpica-unix2-20170629/source/components/namespace/nsaccess.c +++ acpica-unix2-20170728/source/components/namespace/nsaccess.c
@@ -312,6 +312,7 @@ AcpiNsLookup ( @@ -313,6 +313,7 @@ AcpiNsLookup (
ACPI_OBJECT_TYPE ThisSearchType; ACPI_OBJECT_TYPE ThisSearchType;
UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT; UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT;
UINT32 LocalFlags; UINT32 LocalFlags;
@ -3407,7 +3407,7 @@ Index: acpica-unix2-20170629/source/components/namespace/nsaccess.c
ACPI_FUNCTION_TRACE (NsLookup); ACPI_FUNCTION_TRACE (NsLookup);
@@ -691,9 +692,10 @@ AcpiNsLookup ( @@ -702,9 +703,10 @@ AcpiNsLookup (
{ {
/* Complain about a type mismatch */ /* Complain about a type mismatch */
@ -3419,10 +3419,10 @@ Index: acpica-unix2-20170629/source/components/namespace/nsaccess.c
AcpiUtGetTypeName (ThisNode->Type), AcpiUtGetTypeName (ThisNode->Type),
AcpiUtGetTypeName (TypeToCheckFor))); AcpiUtGetTypeName (TypeToCheckFor)));
} }
Index: acpica-unix2-20170629/source/components/namespace/nsparse.c Index: acpica-unix2-20170728/source/components/namespace/nsparse.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/namespace/nsparse.c --- acpica-unix2-20170728.orig/source/components/namespace/nsparse.c
+++ acpica-unix2-20170629/source/components/namespace/nsparse.c +++ acpica-unix2-20170728/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 */
@ -3440,11 +3440,11 @@ Index: acpica-unix2-20170629/source/components/namespace/nsparse.c
Status = AcpiTbGetOwnerId (TableIndex, &OwnerId); Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
Index: acpica-unix2-20170629/source/components/tables/tbdata.c Index: acpica-unix2-20170728/source/components/tables/tbdata.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/tables/tbdata.c --- acpica-unix2-20170728.orig/source/components/tables/tbdata.c
+++ acpica-unix2-20170629/source/components/tables/tbdata.c +++ acpica-unix2-20170728/source/components/tables/tbdata.c
@@ -550,6 +550,7 @@ AcpiTbVerifyTempTable ( @@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
UINT32 *TableIndex) UINT32 *TableIndex)
{ {
ACPI_STATUS Status = AE_OK; ACPI_STATUS Status = AE_OK;
@ -3452,7 +3452,7 @@ Index: acpica-unix2-20170629/source/components/tables/tbdata.c
ACPI_FUNCTION_TRACE (TbVerifyTempTable); ACPI_FUNCTION_TRACE (TbVerifyTempTable);
@@ -579,7 +580,8 @@ AcpiTbVerifyTempTable ( @@ -581,7 +582,8 @@ AcpiTbVerifyTempTable (
{ {
/* Verify the checksum */ /* Verify the checksum */
@ -3462,10 +3462,10 @@ Index: acpica-unix2-20170629/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-20170629/source/components/tables/tbfadt.c Index: acpica-unix2-20170728/source/components/tables/tbfadt.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/tables/tbfadt.c --- acpica-unix2-20170728.orig/source/components/tables/tbfadt.c
+++ acpica-unix2-20170629/source/components/tables/tbfadt.c +++ acpica-unix2-20170728/source/components/tables/tbfadt.c
@@ -520,6 +520,8 @@ AcpiTbConvertFadt ( @@ -520,6 +520,8 @@ AcpiTbConvertFadt (
UINT8 Length; UINT8 Length;
UINT8 Flags; UINT8 Flags;
@ -3545,10 +3545,10 @@ Index: acpica-unix2-20170629/source/components/tables/tbfadt.c
"PmRegisters", 0); "PmRegisters", 0);
} }
} }
Index: acpica-unix2-20170629/source/components/tables/tbfind.c Index: acpica-unix2-20170728/source/components/tables/tbfind.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/tables/tbfind.c --- acpica-unix2-20170728.orig/source/components/tables/tbfind.c
+++ acpica-unix2-20170629/source/components/tables/tbfind.c +++ acpica-unix2-20170728/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)
@ -3562,10 +3562,10 @@ Index: acpica-unix2-20170629/source/components/tables/tbfind.c
{ {
/* Not the requested table */ /* Not the requested table */
Index: acpica-unix2-20170629/source/components/tables/tbprint.c Index: acpica-unix2-20170728/source/components/tables/tbprint.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/tables/tbprint.c --- acpica-unix2-20170728.orig/source/components/tables/tbprint.c
+++ acpica-unix2-20170629/source/components/tables/tbprint.c +++ acpica-unix2-20170728/source/components/tables/tbprint.c
@@ -143,15 +143,18 @@ AcpiTbPrintTableHeader ( @@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
ACPI_TABLE_HEADER *Header) ACPI_TABLE_HEADER *Header)
{ {
@ -3607,10 +3607,10 @@ Index: acpica-unix2-20170629/source/components/tables/tbprint.c
} }
} }
Index: acpica-unix2-20170629/source/components/tables/tbutils.c Index: acpica-unix2-20170728/source/components/tables/tbutils.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/tables/tbutils.c --- acpica-unix2-20170728.orig/source/components/tables/tbutils.c
+++ acpica-unix2-20170629/source/components/tables/tbutils.c +++ acpica-unix2-20170728/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
@ -3670,10 +3670,10 @@ Index: acpica-unix2-20170629/source/components/tables/tbutils.c
{ {
AcpiGbl_FadtIndex = TableIndex; AcpiGbl_FadtIndex = TableIndex;
AcpiTbParseFadt (); AcpiTbParseFadt ();
Index: acpica-unix2-20170629/source/components/tables/tbxface.c Index: acpica-unix2-20170728/source/components/tables/tbxface.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/tables/tbxface.c --- acpica-unix2-20170728.orig/source/components/tables/tbxface.c
+++ acpica-unix2-20170629/source/components/tables/tbxface.c +++ acpica-unix2-20170728/source/components/tables/tbxface.c
@@ -290,8 +290,11 @@ AcpiGetTableHeader ( @@ -290,8 +290,11 @@ AcpiGetTableHeader (
for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++) for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
@ -3687,10 +3687,10 @@ Index: acpica-unix2-20170629/source/components/tables/tbxface.c
{ {
continue; continue;
} }
Index: acpica-unix2-20170629/source/components/tables/tbxfload.c Index: acpica-unix2-20170728/source/components/tables/tbxfload.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/components/tables/tbxfload.c --- acpica-unix2-20170728.orig/source/components/tables/tbxfload.c
+++ acpica-unix2-20170629/source/components/tables/tbxfload.c +++ acpica-unix2-20170728/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;
@ -3710,10 +3710,10 @@ Index: acpica-unix2-20170629/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-20170629/source/include/acmacros.h Index: acpica-unix2-20170728/source/include/acmacros.h
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/include/acmacros.h --- acpica-unix2-20170728.orig/source/include/acmacros.h
+++ acpica-unix2-20170629/source/include/acmacros.h +++ acpica-unix2-20170728/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];}
@ -3777,11 +3777,11 @@ Index: acpica-unix2-20170629/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-20170629/source/include/platform/aclinux.h Index: acpica-unix2-20170728/source/include/platform/aclinux.h
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/include/platform/aclinux.h --- acpica-unix2-20170728.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20170629/source/include/platform/aclinux.h +++ acpica-unix2-20170728/source/include/platform/aclinux.h
@@ -224,6 +224,10 @@ @@ -226,6 +226,10 @@
#define __cdecl #define __cdecl
#endif #endif
@ -3792,10 +3792,10 @@ Index: acpica-unix2-20170629/source/include/platform/aclinux.h
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ACLINUX_H__ */ #endif /* __ACLINUX_H__ */
Index: acpica-unix2-20170629/source/tools/acpiexec/aetables.c Index: acpica-unix2-20170728/source/tools/acpiexec/aetables.c
=================================================================== ===================================================================
--- acpica-unix2-20170629.orig/source/tools/acpiexec/aetables.c --- acpica-unix2-20170728.orig/source/tools/acpiexec/aetables.c
+++ acpica-unix2-20170629/source/tools/acpiexec/aetables.c +++ acpica-unix2-20170728/source/tools/acpiexec/aetables.c
@@ -146,21 +146,25 @@ AeInitializeTableHeader ( @@ -146,21 +146,25 @@ AeInitializeTableHeader (
char *Signature, char *Signature,
UINT32 Length) UINT32 Length)