From 5f1097d5a8370488ec9b45c76ceb3b48953b8694 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Tue, 15 Dec 2015 15:30:26 -0700
Subject: [PATCH] Refresh all the patches.

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 OPT_LDFLAGS.patch          |   6 +-
 acpica-tools.spec          |   2 +-
 asllookup-miscompare.patch |   6 +-
 asllookup-ppc64.patch      |   6 +-
 debian-big_endian.patch    | 231 +++++++++++++++++++------------------
 debian-unaligned.patch     |  52 ++++-----
 f23-harden.patch           |  14 +--
 int-format.patch           | 146 +++++++++++------------
 name-miscompare.patch      |  10 +-
 re-enable-big-endian.patch |   6 +-
 template.patch             |   7 +-
 11 files changed, 247 insertions(+), 239 deletions(-)

diff --git a/OPT_LDFLAGS.patch b/OPT_LDFLAGS.patch
index 453b534..3f3adf4 100644
--- a/OPT_LDFLAGS.patch
+++ b/OPT_LDFLAGS.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20150930/generate/unix/Makefile.config
+Index: acpica-unix2-20151124/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix2-20150930.orig/generate/unix/Makefile.config
-+++ acpica-unix2-20150930/generate/unix/Makefile.config
+--- acpica-unix2-20151124.orig/generate/unix/Makefile.config
++++ acpica-unix2-20151124/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 1d34350..1b6e1b6 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -188,7 +188,7 @@ fi
 %changelog
 * Tue Dec 15 2015 Al Stone <ahs3@redhat.com> - 20151124-1
 - Update to latest upstream.  Closes BZ#1267772.
-- Refresh patches, and remove one no longer needed.
+- Refresh patches.
 
 * Wed Oct 14 2015 Al Stone <ahs3@redhat.com> - 20150930-1
 - Update to latest upstream.  Closes BZ#1267772.
diff --git a/asllookup-miscompare.patch b/asllookup-miscompare.patch
index 8ec8082..241858d 100644
--- a/asllookup-miscompare.patch
+++ b/asllookup-miscompare.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20150930/source/compiler/asllookup.c
+Index: acpica-unix2-20151124/source/compiler/asllookup.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/asllookup.c
-+++ acpica-unix2-20150930/source/compiler/asllookup.c
+--- acpica-unix2-20151124.orig/source/compiler/asllookup.c
++++ acpica-unix2-20151124/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 ab4da6f..28d34c7 100644
--- a/asllookup-ppc64.patch
+++ b/asllookup-ppc64.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20150930/source/compiler/asllookup.c
+Index: acpica-unix2-20151124/source/compiler/asllookup.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/asllookup.c
-+++ acpica-unix2-20150930/source/compiler/asllookup.c
+--- acpica-unix2-20151124.orig/source/compiler/asllookup.c
++++ acpica-unix2-20151124/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 13dd0c0..eb0f5ff 100644
--- a/debian-big_endian.patch
+++ b/debian-big_endian.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20150930/source/compiler/aslcodegen.c
+Index: acpica-unix2-20151124/source/compiler/aslcodegen.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslcodegen.c
-+++ acpica-unix2-20150930/source/compiler/aslcodegen.c
+--- acpica-unix2-20151124.orig/source/compiler/aslcodegen.c
++++ acpica-unix2-20151124/source/compiler/aslcodegen.c
 @@ -249,16 +249,12 @@ CgWriteAmlOpcode (
      ACPI_PARSE_OBJECT       *Op)
  {
@@ -25,7 +25,7 @@ Index: acpica-unix2-20150930/source/compiler/aslcodegen.c
  
      /* We expect some DEFAULT_ARGs, just ignore them */
  
-@@ -281,51 +277,52 @@ CgWriteAmlOpcode (
+@@ -282,51 +278,52 @@ CgWriteAmlOpcode (
  
          /* Special opcodes for within a field definition */
  
@@ -89,7 +89,7 @@ Index: acpica-unix2-20150930/source/compiler/aslcodegen.c
          break;
      }
  
-@@ -336,8 +333,8 @@ CgWriteAmlOpcode (
+@@ -337,8 +334,8 @@ CgWriteAmlOpcode (
          if (Op->Asl.AmlPkgLenBytes == 1)
          {
              /* Simplest case -- no bytes to follow, just write the count */
@@ -100,7 +100,7 @@ Index: acpica-unix2-20150930/source/compiler/aslcodegen.c
          }
          else if (Op->Asl.AmlPkgLenBytes != 0)
          {
-@@ -347,7 +344,7 @@ CgWriteAmlOpcode (
+@@ -348,7 +345,7 @@ CgWriteAmlOpcode (
               */
              PkgLenFirstByte = (UINT8)
                  (((UINT32) (Op->Asl.AmlPkgLenBytes - 1) << 6) |
@@ -109,15 +109,17 @@ Index: acpica-unix2-20150930/source/compiler/aslcodegen.c
  
              CgLocalWriteAmlData (Op, &PkgLenFirstByte, 1);
  
-@@ -355,37 +352,44 @@ CgWriteAmlOpcode (
+@@ -356,39 +353,47 @@ CgWriteAmlOpcode (
               * Shift the length over by the 4 bits we just stuffed
               * in the first byte
               */
 -            PkgLen.Len >>= 4;
 +            PkgLen >>= 4;
  
-             /* Now we can write the remaining bytes - either 1, 2, or 3 bytes */
--
+             /*
+              * Now we can write the remaining bytes -
+              * either 1, 2, or 3 bytes
+              */
 -            for (i = 0; i < (UINT32) (Op->Asl.AmlPkgLenBytes - 1); i++)
 +            Byte = ACPI_LOBYTE(PkgLen);
 +            CgLocalWriteAmlData (Op, &Byte, 1);
@@ -167,7 +169,7 @@ Index: acpica-unix2-20150930/source/compiler/aslcodegen.c
          break;
  
      case AML_STRING_OP:
-@@ -419,6 +423,7 @@ CgWriteTableHeader (
+@@ -422,6 +427,7 @@ CgWriteTableHeader (
      ACPI_PARSE_OBJECT       *Op)
  {
      ACPI_PARSE_OBJECT       *Child;
@@ -175,7 +177,7 @@ Index: acpica-unix2-20150930/source/compiler/aslcodegen.c
  
  
      /* AML filename */
-@@ -455,7 +460,7 @@ CgWriteTableHeader (
+@@ -458,7 +464,7 @@ CgWriteTableHeader (
      /* OEM Revision */
  
      Child = Child->Asl.Next;
@@ -184,7 +186,7 @@ Index: acpica-unix2-20150930/source/compiler/aslcodegen.c
  
      /* Compiler ID */
  
-@@ -463,11 +468,12 @@ CgWriteTableHeader (
+@@ -466,12 +472,13 @@ CgWriteTableHeader (
  
      /* Compiler version */
  
@@ -194,12 +196,14 @@ Index: acpica-unix2-20150930/source/compiler/aslcodegen.c
  
      /* Table length. Checksum zero for now, will rewrite later */
  
--    TableHeader.Length   = Gbl_TableLength;
-+    ACPI_MOVE_32_TO_32(&TableHeader.Length, &Gbl_TableLength);
+-    TableHeader.Length = sizeof (ACPI_TABLE_HEADER) +
+-        Op->Asl.AmlSubtreeLength;
++    DWord = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength;
++    ACPI_MOVE_32_TO_32(&TableHeader.Length, &DWord);
      TableHeader.Checksum = 0;
  
-     CgLocalWriteAmlData (Op, &TableHeader, sizeof (ACPI_TABLE_HEADER));
-@@ -531,7 +537,10 @@ CgWriteNode (
+     Op->Asl.FinalAmlOffset = ftell (Gbl_Files[ASL_FILE_AML_OUTPUT].Handle);
+@@ -584,7 +591,10 @@ CgWriteNode (
      ACPI_PARSE_OBJECT       *Op)
  {
      ASL_RESOURCE_NODE       *Rnode;
@@ -211,7 +215,7 @@ Index: acpica-unix2-20150930/source/compiler/aslcodegen.c
  
      /* Always check for DEFAULT_ARG and other "Noop" nodes */
      /* TBD: this may not be the best place for this check */
-@@ -549,13 +558,24 @@ CgWriteNode (
+@@ -602,13 +612,24 @@ CgWriteNode (
      switch (Op->Asl.AmlOpcode)
      {
      case AML_RAW_DATA_BYTE:
@@ -239,11 +243,11 @@ Index: acpica-unix2-20150930/source/compiler/aslcodegen.c
  
      case AML_RAW_DATA_BUFFER:
  
-Index: acpica-unix2-20150930/source/compiler/aslopcodes.c
+Index: acpica-unix2-20151124/source/compiler/aslopcodes.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslopcodes.c
-+++ acpica-unix2-20150930/source/compiler/aslopcodes.c
-@@ -531,6 +531,7 @@ OpcDoUnicode (
+--- acpica-unix2-20151124.orig/source/compiler/aslopcodes.c
++++ acpica-unix2-20151124/source/compiler/aslopcodes.c
+@@ -534,6 +534,7 @@ OpcDoUnicode (
      UINT32                  i;
      UINT8                   *AsciiString;
      UINT16                  *UnicodeString;
@@ -251,7 +255,7 @@ Index: acpica-unix2-20150930/source/compiler/aslopcodes.c
      ACPI_PARSE_OBJECT       *BufferLengthOp;
  
  
-@@ -557,7 +558,8 @@ OpcDoUnicode (
+@@ -560,7 +561,8 @@ OpcDoUnicode (
  
      for (i = 0; i < Count; i++)
      {
@@ -261,11 +265,11 @@ Index: acpica-unix2-20150930/source/compiler/aslopcodes.c
      }
  
      /*
-Index: acpica-unix2-20150930/source/compiler/aslrestype1.c
+Index: acpica-unix2-20151124/source/compiler/aslrestype1.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslrestype1.c
-+++ acpica-unix2-20150930/source/compiler/aslrestype1.c
-@@ -143,6 +143,11 @@ RsDoMemory24Descriptor (
+--- acpica-unix2-20151124.orig/source/compiler/aslrestype1.c
++++ acpica-unix2-20151124/source/compiler/aslrestype1.c
+@@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
      ACPI_PARSE_OBJECT       *LengthOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
@@ -277,17 +281,17 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype1.c
      UINT32                  i;
  
  
-@@ -152,7 +157,8 @@ RsDoMemory24Descriptor (
+@@ -151,7 +156,8 @@ RsDoMemory24Descriptor (
  
      Descriptor = Rnode->Buffer;
-     Descriptor->Memory24.DescriptorType  = ACPI_RESOURCE_NAME_MEMORY24;
+     Descriptor->Memory24.DescriptorType = ACPI_RESOURCE_NAME_MEMORY24;
 -    Descriptor->Memory24.ResourceLength = 9;
 +    ResourceLength = 9;
 +    ACPI_MOVE_16_TO_16(&Descriptor->Memory24.ResourceLength, &ResourceLength);
  
      /* Process all child initialization nodes */
  
-@@ -169,7 +175,7 @@ RsDoMemory24Descriptor (
+@@ -168,7 +174,7 @@ RsDoMemory24Descriptor (
  
          case 1: /* Min Address */
  
@@ -296,7 +300,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype1.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Minimum));
              MinOp = InitializerOp;
-@@ -177,7 +183,7 @@ RsDoMemory24Descriptor (
+@@ -176,7 +182,7 @@ RsDoMemory24Descriptor (
  
          case 2: /* Max Address */
  
@@ -305,7 +309,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype1.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Maximum));
              MaxOp = InitializerOp;
-@@ -185,14 +191,14 @@ RsDoMemory24Descriptor (
+@@ -184,14 +190,14 @@ RsDoMemory24Descriptor (
  
          case 3: /* Alignment */
  
@@ -322,7 +326,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype1.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.AddressLength));
              LengthOp = InitializerOp;
-@@ -215,12 +221,17 @@ RsDoMemory24Descriptor (
+@@ -214,12 +220,17 @@ RsDoMemory24Descriptor (
      /* Validate the Min/Max/Len/Align values (Alignment==0 means 64K) */
  
      RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY24,
@@ -344,7 +348,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype1.c
      return (Rnode);
  }
  
-@@ -249,6 +260,11 @@ RsDoMemory32Descriptor (
+@@ -248,6 +259,11 @@ RsDoMemory32Descriptor (
      ACPI_PARSE_OBJECT       *AlignOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
@@ -356,17 +360,17 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype1.c
      UINT32                  i;
  
  
-@@ -258,7 +274,8 @@ RsDoMemory32Descriptor (
+@@ -257,7 +273,8 @@ RsDoMemory32Descriptor (
  
      Descriptor = Rnode->Buffer;
-     Descriptor->Memory32.DescriptorType  = ACPI_RESOURCE_NAME_MEMORY32;
+     Descriptor->Memory32.DescriptorType = ACPI_RESOURCE_NAME_MEMORY32;
 -    Descriptor->Memory32.ResourceLength = 17;
 +    ResourceLength = 17;
 +    ACPI_MOVE_16_TO_16(&Descriptor->Memory32.ResourceLength, &ResourceLength);
  
      /* Process all child initialization nodes */
  
-@@ -275,7 +292,7 @@ RsDoMemory32Descriptor (
+@@ -274,7 +291,7 @@ RsDoMemory32Descriptor (
  
          case 1:  /* Min Address */
  
@@ -375,7 +379,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Minimum));
              MinOp = InitializerOp;
-@@ -283,7 +300,7 @@ RsDoMemory32Descriptor (
+@@ -282,7 +299,7 @@ RsDoMemory32Descriptor (
  
          case 2: /* Max Address */
  
@@ -384,7 +388,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Maximum));
              MaxOp = InitializerOp;
-@@ -291,7 +308,7 @@ RsDoMemory32Descriptor (
+@@ -290,7 +307,7 @@ RsDoMemory32Descriptor (
  
          case 3: /* Alignment */
  
@@ -393,7 +397,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_ALIGNMENT,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Alignment));
              AlignOp = InitializerOp;
-@@ -299,7 +316,7 @@ RsDoMemory32Descriptor (
+@@ -298,7 +315,7 @@ RsDoMemory32Descriptor (
  
          case 4: /* Length */
  
@@ -402,7 +406,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.AddressLength));
              LengthOp = InitializerOp;
-@@ -322,12 +339,17 @@ RsDoMemory32Descriptor (
+@@ -321,12 +338,17 @@ RsDoMemory32Descriptor (
      /* Validate the Min/Max/Len/Align values */
  
      RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY32,
@@ -424,7 +428,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype1.c
      return (Rnode);
  }
  
-@@ -352,6 +374,7 @@ RsDoMemory32FixedDescriptor (
+@@ -351,6 +373,7 @@ RsDoMemory32FixedDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
@@ -432,17 +436,17 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype1.c
      UINT32                  i;
  
  
-@@ -361,7 +384,8 @@ RsDoMemory32FixedDescriptor (
+@@ -360,7 +383,8 @@ RsDoMemory32FixedDescriptor (
  
      Descriptor = Rnode->Buffer;
-     Descriptor->FixedMemory32.DescriptorType  = ACPI_RESOURCE_NAME_FIXED_MEMORY32;
+     Descriptor->FixedMemory32.DescriptorType = ACPI_RESOURCE_NAME_FIXED_MEMORY32;
 -    Descriptor->FixedMemory32.ResourceLength = 9;
 +    ResourceLength = 9;
 +    ACPI_MOVE_16_TO_16(&Descriptor->FixedMemory32.ResourceLength, &ResourceLength);
  
      /* Process all child initialization nodes */
  
-@@ -378,14 +402,16 @@ RsDoMemory32FixedDescriptor (
+@@ -377,14 +401,16 @@ RsDoMemory32FixedDescriptor (
  
          case 1: /* Address */
  
@@ -461,10 +465,10 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
              break;
-Index: acpica-unix2-20150930/source/compiler/aslrestype1i.c
+Index: acpica-unix2-20151124/source/compiler/aslrestype1i.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslrestype1i.c
-+++ acpica-unix2-20150930/source/compiler/aslrestype1i.c
+--- acpica-unix2-20151124.orig/source/compiler/aslrestype1i.c
++++ acpica-unix2-20151124/source/compiler/aslrestype1i.c
 @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -601,10 +605,10 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype1i.c
 +    ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
      return (Rnode);
  }
-Index: acpica-unix2-20150930/source/compiler/aslrestype2.c
+Index: acpica-unix2-20151124/source/compiler/aslrestype2.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslrestype2.c
-+++ acpica-unix2-20150930/source/compiler/aslrestype2.c
+--- acpica-unix2-20151124.orig/source/compiler/aslrestype2.c
++++ acpica-unix2-20151124/source/compiler/aslrestype2.c
 @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -634,7 +638,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_ADDRESS,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.Address));
              break;
-@@ -171,6 +175,7 @@ RsDoInterruptDescriptor (
+@@ -172,6 +176,7 @@ RsDoInterruptDescriptor (
      AML_RESOURCE            *Rover = NULL;
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -642,7 +646,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2.c
      UINT16                  StringLength = 0;
      UINT32                  OptionIndex = 0;
      UINT32                  CurrentByteOffset;
-@@ -219,7 +224,7 @@ RsDoInterruptDescriptor (
+@@ -220,7 +225,7 @@ RsDoInterruptDescriptor (
       * Initial descriptor length -- may be enlarged if there are
       * optional fields present
       */
@@ -651,7 +655,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2.c
      Descriptor->ExtendedIrq.InterruptCount  = 0;
  
      Rover = ACPI_CAST_PTR (AML_RESOURCE,
-@@ -327,10 +332,11 @@ RsDoInterruptDescriptor (
+@@ -328,10 +333,11 @@ RsDoInterruptDescriptor (
  
              /* Save the integer and move pointer to the next one */
  
@@ -665,7 +669,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2.c
  
              /* Case 7: First interrupt number in list */
  
-@@ -366,7 +372,7 @@ RsDoInterruptDescriptor (
+@@ -367,7 +373,7 @@ RsDoInterruptDescriptor (
      {
          Rover->ByteItem = ResSourceIndex;
          Rover = ACPI_ADD_PTR (AML_RESOURCE, &(Rover->ByteItem), 1);
@@ -674,7 +678,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2.c
      }
  
      /* Add optional ResSource string if present */
-@@ -378,13 +384,14 @@ RsDoInterruptDescriptor (
+@@ -379,14 +385,15 @@ RsDoInterruptDescriptor (
          Rover = ACPI_ADD_PTR (
                      AML_RESOURCE, &(Rover->ByteItem), StringLength);
  
@@ -683,27 +687,28 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2.c
 +        ResourceLength = (UINT16) (ResourceLength + StringLength);
      }
  
-     Rnode->BufferLength = (ASL_RESDESC_OFFSET (ExtendedIrq.Interrupts[0]) -
-                            ASL_RESDESC_OFFSET (ExtendedIrq.DescriptorType))
-                            + OptionIndex + StringLength;
+     Rnode->BufferLength =
+         (ASL_RESDESC_OFFSET (ExtendedIrq.Interrupts[0]) -
+         ASL_RESDESC_OFFSET (ExtendedIrq.DescriptorType))
+         + OptionIndex + StringLength;
 +    ACPI_MOVE_16_TO_16(&Descriptor->ExtendedIrq.ResourceLength,
 +		    &ResourceLength);
      return (Rnode);
  }
  
-@@ -432,7 +439,7 @@ RsDoVendorLargeDescriptor (
+@@ -434,7 +441,7 @@ RsDoVendorLargeDescriptor (
  
      Descriptor = Rnode->Buffer;
-     Descriptor->VendorLarge.DescriptorType  = ACPI_RESOURCE_NAME_VENDOR_LARGE;
+     Descriptor->VendorLarge.DescriptorType = ACPI_RESOURCE_NAME_VENDOR_LARGE;
 -    Descriptor->VendorLarge.ResourceLength = (UINT16) i;
 +    ACPI_MOVE_32_TO_16(&Descriptor->VendorLarge.ResourceLength, &i);
  
      /* Point to end-of-descriptor for vendor data */
  
-Index: acpica-unix2-20150930/source/compiler/aslrestype2d.c
+Index: acpica-unix2-20151124/source/compiler/aslrestype2d.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslrestype2d.c
-+++ acpica-unix2-20150930/source/compiler/aslrestype2d.c
+--- acpica-unix2-20151124.orig/source/compiler/aslrestype2d.c
++++ acpica-unix2-20151124/source/compiler/aslrestype2d.c
 @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
      ACPI_PARSE_OBJECT       *GranOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -1059,10 +1064,10 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2d.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix2-20150930/source/compiler/aslrestype2e.c
+Index: acpica-unix2-20151124/source/compiler/aslrestype2e.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslrestype2e.c
-+++ acpica-unix2-20150930/source/compiler/aslrestype2e.c
+--- acpica-unix2-20151124.orig/source/compiler/aslrestype2e.c
++++ acpica-unix2-20151124/source/compiler/aslrestype2e.c
 @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
      ACPI_PARSE_OBJECT       *GranOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -1078,10 +1083,10 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2e.c
      UINT32                  i;
  
 @@ -94,9 +101,10 @@ RsDoExtendedIoDescriptor (
-     Descriptor->ExtAddress64.ResourceType    = ACPI_ADDRESS_TYPE_IO_RANGE;
-     Descriptor->ExtAddress64.RevisionID      = AML_RESOURCE_EXTENDED_ADDRESS_REVISION;
+     Descriptor->ExtAddress64.ResourceType = ACPI_ADDRESS_TYPE_IO_RANGE;
+     Descriptor->ExtAddress64.RevisionID = AML_RESOURCE_EXTENDED_ADDRESS_REVISION;
  
--    Descriptor->ExtAddress64.ResourceLength  = (UINT16)
+-    Descriptor->ExtAddress64.ResourceLength = (UINT16)
 -        (sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) -
 +    ResourceLength  = (UINT16) (sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) -
           sizeof (AML_RESOURCE_LARGE_HEADER));
@@ -1168,10 +1173,10 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2e.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
          StringLength;
      return (Rnode);
-Index: acpica-unix2-20150930/source/compiler/aslrestype2q.c
+Index: acpica-unix2-20151124/source/compiler/aslrestype2q.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslrestype2q.c
-+++ acpica-unix2-20150930/source/compiler/aslrestype2q.c
+--- acpica-unix2-20151124.orig/source/compiler/aslrestype2q.c
++++ acpica-unix2-20151124/source/compiler/aslrestype2q.c
 @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT8                   *OptionalFields;
@@ -1510,10 +1515,10 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2q.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
+Index: acpica-unix2-20151124/source/compiler/aslrestype2s.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslrestype2s.c
-+++ acpica-unix2-20150930/source/compiler/aslrestype2s.c
+--- acpica-unix2-20151124.orig/source/compiler/aslrestype2s.c
++++ acpica-unix2-20151124/source/compiler/aslrestype2s.c
 @@ -290,6 +290,9 @@ RsDoGpioIntDescriptor (
      UINT16                  VendorLength;
      UINT16                  InterruptLength;
@@ -1524,7 +1529,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
      UINT32                  CurrentByteOffset;
      UINT32                  PinCount = 0;
      UINT32                  i;
-@@ -349,21 +352,21 @@ RsDoGpioIntDescriptor (
+@@ -353,21 +356,21 @@ RsDoGpioIntDescriptor (
          {
          case 0: /* Interrupt Mode - edge/level [Flag] (_MOD) */
  
@@ -1549,7 +1554,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
              RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_INTERRUPTSHARE,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 3, 2);
              break;
-@@ -377,7 +380,7 @@ RsDoGpioIntDescriptor (
+@@ -381,7 +384,7 @@ RsDoGpioIntDescriptor (
  
          case 4: /* Debounce Timeout [WORD] (_DBT) */
  
@@ -1558,7 +1563,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_DEBOUNCETIME,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.DebounceTimeout));
              break;
-@@ -403,7 +406,7 @@ RsDoGpioIntDescriptor (
+@@ -408,7 +411,7 @@ RsDoGpioIntDescriptor (
  
          case 7: /* Resource Usage (consumer/producer) */
  
@@ -1567,7 +1572,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
              break;
  
          case 8: /* Resource Tag (Descriptor Name) */
-@@ -468,6 +471,10 @@ RsDoGpioIntDescriptor (
+@@ -473,6 +476,10 @@ RsDoGpioIntDescriptor (
          InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
      }
  
@@ -1575,10 +1580,10 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
 +    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.DebounceTimeout, &DebounceTimeout);
 +    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.Flags, &Flags);
 +
-     MpSaveGpioInfo (Info->MappingOp, Descriptor, PinCount, PinList, ResourceSource);
+     MpSaveGpioInfo (Info->MappingOp, Descriptor,
+         PinCount, PinList, ResourceSource);
      return (Rnode);
- }
-@@ -500,6 +507,10 @@ RsDoGpioIoDescriptor (
+@@ -506,6 +513,10 @@ RsDoGpioIoDescriptor (
      UINT16                  VendorLength;
      UINT16                  InterruptLength;
      UINT16                  DescriptorSize;
@@ -1589,7 +1594,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
      UINT32                  CurrentByteOffset;
      UINT32                  PinCount = 0;
      UINT32                  i;
-@@ -560,7 +571,7 @@ RsDoGpioIoDescriptor (
+@@ -569,7 +580,7 @@ RsDoGpioIoDescriptor (
          {
          case 0: /* Share Type [Flags] (_SHR) */
  
@@ -1598,7 +1603,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
              RsCreateBitField (InitializerOp, ACPI_RESTAG_INTERRUPTSHARE,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 3);
              break;
-@@ -574,21 +585,21 @@ RsDoGpioIoDescriptor (
+@@ -583,21 +594,21 @@ RsDoGpioIoDescriptor (
  
          case 2: /* Debounce Timeout [WORD] (_DBT) */
  
@@ -1623,7 +1628,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
              RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_IORESTRICTION,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 0, 2);
              break;
-@@ -614,7 +625,7 @@ RsDoGpioIoDescriptor (
+@@ -623,7 +634,7 @@ RsDoGpioIoDescriptor (
  
          case 7: /* Resource Usage (consumer/producer) */
  
@@ -1632,7 +1637,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
              break;
  
          case 8: /* Resource Tag (Descriptor Name) */
-@@ -678,6 +689,11 @@ RsDoGpioIoDescriptor (
+@@ -687,6 +698,11 @@ RsDoGpioIoDescriptor (
          InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
      }
  
@@ -1641,10 +1646,10 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
 +    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.DriveStrength, &DriveStrength);
 +    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.Flags, &Flags);
 +
-     MpSaveGpioInfo (Info->MappingOp, Descriptor, PinCount, PinList, ResourceSource);
+     MpSaveGpioInfo (Info->MappingOp, Descriptor,
+         PinCount, PinList, ResourceSource);
      return (Rnode);
- }
-@@ -707,6 +723,9 @@ RsDoI2cSerialBusDescriptor (
+@@ -717,6 +733,9 @@ RsDoI2cSerialBusDescriptor (
      UINT16                  ResSourceLength;
      UINT16                  VendorLength;
      UINT16                  DescriptorSize;
@@ -1654,7 +1659,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
      UINT32                  CurrentByteOffset;
      UINT32                  i;
  
-@@ -756,7 +775,7 @@ RsDoI2cSerialBusDescriptor (
+@@ -768,7 +787,7 @@ RsDoI2cSerialBusDescriptor (
          {
          case 0: /* Slave Address [WORD] (_ADR) */
  
@@ -1663,7 +1668,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.SlaveAddress));
              break;
-@@ -770,14 +789,14 @@ RsDoI2cSerialBusDescriptor (
+@@ -782,14 +801,14 @@ RsDoI2cSerialBusDescriptor (
  
          case 2: /* Connection Speed [DWORD] (_SPE) */
  
@@ -1680,7 +1685,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
              RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.TypeSpecificFlags), 0);
              break;
-@@ -825,6 +844,9 @@ RsDoI2cSerialBusDescriptor (
+@@ -838,6 +857,9 @@ RsDoI2cSerialBusDescriptor (
          InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
      }
  
@@ -1690,7 +1695,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
      MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
      return (Rnode);
  }
-@@ -854,6 +876,9 @@ RsDoSpiSerialBusDescriptor (
+@@ -867,6 +889,9 @@ RsDoSpiSerialBusDescriptor (
      UINT16                  ResSourceLength;
      UINT16                  VendorLength;
      UINT16                  DescriptorSize;
@@ -1700,7 +1705,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
      UINT32                  CurrentByteOffset;
      UINT32                  i;
  
-@@ -903,21 +928,21 @@ RsDoSpiSerialBusDescriptor (
+@@ -919,21 +944,21 @@ RsDoSpiSerialBusDescriptor (
          {
          case 0: /* Device Selection [WORD] (_ADR) */
  
@@ -1725,7 +1730,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
              RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 0);
              break;
-@@ -938,7 +963,7 @@ RsDoSpiSerialBusDescriptor (
+@@ -954,7 +979,7 @@ RsDoSpiSerialBusDescriptor (
  
          case 5: /* Connection Speed [DWORD] (_SPE) */
  
@@ -1734,7 +1739,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.ConnectionSpeed));
              break;
-@@ -1000,6 +1025,10 @@ RsDoSpiSerialBusDescriptor (
+@@ -1017,6 +1042,10 @@ RsDoSpiSerialBusDescriptor (
          InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
      }
  
@@ -1745,7 +1750,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
      MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
      return (Rnode);
  }
-@@ -1029,6 +1058,10 @@ RsDoUartSerialBusDescriptor (
+@@ -1046,6 +1075,10 @@ RsDoUartSerialBusDescriptor (
      UINT16                  ResSourceLength;
      UINT16                  VendorLength;
      UINT16                  DescriptorSize;
@@ -1756,7 +1761,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
      UINT32                  CurrentByteOffset;
      UINT32                  i;
  
-@@ -1078,21 +1111,21 @@ RsDoUartSerialBusDescriptor (
+@@ -1097,21 +1130,21 @@ RsDoUartSerialBusDescriptor (
          {
          case 0: /* Connection Speed (Baud Rate) [DWORD] (_SPE) */
  
@@ -1781,7 +1786,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
              RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_STOPBITS,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 2, 2);
              break;
-@@ -1106,7 +1139,7 @@ RsDoUartSerialBusDescriptor (
+@@ -1125,7 +1158,7 @@ RsDoUartSerialBusDescriptor (
  
          case 4: /* Endianness [Flag] (_END) */
  
@@ -1790,7 +1795,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
              RsCreateBitField (InitializerOp, ACPI_RESTAG_ENDIANNESS,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 7);
              break;
-@@ -1120,21 +1153,21 @@ RsDoUartSerialBusDescriptor (
+@@ -1139,21 +1172,21 @@ RsDoUartSerialBusDescriptor (
  
          case 6: /* Flow Control [Flags] (_FLC) */
  
@@ -1815,7 +1820,7 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_TX,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TxFifoSize));
              break;
-@@ -1192,6 +1225,11 @@ RsDoUartSerialBusDescriptor (
+@@ -1212,6 +1245,11 @@ RsDoUartSerialBusDescriptor (
          InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
      }
  
@@ -1827,10 +1832,10 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2s.c
      MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
      return (Rnode);
  }
-Index: acpica-unix2-20150930/source/compiler/aslrestype2w.c
+Index: acpica-unix2-20151124/source/compiler/aslrestype2w.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslrestype2w.c
-+++ acpica-unix2-20150930/source/compiler/aslrestype2w.c
+--- acpica-unix2-20151124.orig/source/compiler/aslrestype2w.c
++++ acpica-unix2-20151124/source/compiler/aslrestype2w.c
 @@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
      UINT8                   *OptionalFields;
      UINT16                  StringLength = 0;
@@ -2174,10 +2179,10 @@ Index: acpica-unix2-20150930/source/compiler/aslrestype2w.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix2-20150930/source/include/acmacros.h
+Index: acpica-unix2-20151124/source/include/acmacros.h
 ===================================================================
---- acpica-unix2-20150930.orig/source/include/acmacros.h
-+++ acpica-unix2-20150930/source/include/acmacros.h
+--- acpica-unix2-20151124.orig/source/include/acmacros.h
++++ acpica-unix2-20151124/source/include/acmacros.h
 @@ -100,7 +100,8 @@
  
  /* 32-bit source, 16/32/64 destination */
@@ -2215,11 +2220,11 @@ Index: acpica-unix2-20150930/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-20150930/source/include/platform/aclinux.h
+Index: acpica-unix2-20151124/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix2-20150930.orig/source/include/platform/aclinux.h
-+++ acpica-unix2-20150930/source/include/platform/aclinux.h
-@@ -167,6 +167,7 @@
+--- acpica-unix2-20151124.orig/source/include/platform/aclinux.h
++++ acpica-unix2-20151124/source/include/platform/aclinux.h
+@@ -170,6 +170,7 @@
  #include <stdlib.h>
  #include <ctype.h>
  #include <unistd.h>
@@ -2227,7 +2232,7 @@ Index: acpica-unix2-20150930/source/include/platform/aclinux.h
  
  /* Define/disable kernel-specific declarators */
  
-@@ -179,8 +180,7 @@
+@@ -182,8 +183,7 @@
  #define ACPI_FLUSH_CPU_CACHE()
  #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread))
  
@@ -2237,7 +2242,7 @@ Index: acpica-unix2-20150930/source/include/platform/aclinux.h
  #define ACPI_MACHINE_WIDTH          64
  #define COMPILER_DEPENDENT_INT64    long
  #define COMPILER_DEPENDENT_UINT64   unsigned long
-@@ -191,6 +191,10 @@
+@@ -194,6 +194,10 @@
  #define ACPI_USE_NATIVE_DIVIDE
  #endif
  
diff --git a/debian-unaligned.patch b/debian-unaligned.patch
index 9e17627..48e4811 100644
--- a/debian-unaligned.patch
+++ b/debian-unaligned.patch
@@ -15,12 +15,12 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  source/include/actypes.h              | 26 +++++++++++++-------------
  3 file modificati, 32 inserzioni(+), 21 rimozioni(-)
 
-Index: acpica-unix2-20150930/source/compiler/asltree.c
+Index: acpica-unix2-20151124/source/compiler/asltree.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/asltree.c
-+++ acpica-unix2-20150930/source/compiler/asltree.c
-@@ -863,28 +863,31 @@ TrCreateValuedLeafNode (
-         "\nCreateValuedLeafNode  Ln/Col %u/%u NewNode %p  Op %s  Value %8.8X%8.8X  ",
+--- acpica-unix2-20151124.orig/source/compiler/asltree.c
++++ acpica-unix2-20151124/source/compiler/asltree.c
+@@ -870,28 +870,31 @@ TrCreateValuedLeafNode (
+         "Op %s  Value %8.8X%8.8X  ",
          Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode),
          ACPI_FORMAT_UINT64 (Value));
 -    Op->Asl.Value.Integer = Value;
@@ -56,7 +56,7 @@ Index: acpica-unix2-20150930/source/compiler/asltree.c
          break;
  
      case PARSEOP_METHOD:
-@@ -894,12 +897,14 @@ TrCreateValuedLeafNode (
+@@ -901,12 +904,14 @@ TrCreateValuedLeafNode (
  
      case PARSEOP_INTEGER:
  
@@ -71,10 +71,10 @@ Index: acpica-unix2-20150930/source/compiler/asltree.c
          break;
      }
  
-Index: acpica-unix2-20150930/source/components/executer/exoparg2.c
+Index: acpica-unix2-20151124/source/components/executer/exoparg2.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/components/executer/exoparg2.c
-+++ acpica-unix2-20150930/source/components/executer/exoparg2.c
+--- acpica-unix2-20151124.orig/source/components/executer/exoparg2.c
++++ acpica-unix2-20151124/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;
@@ -84,20 +84,20 @@ Index: acpica-unix2-20150930/source/components/executer/exoparg2.c
      ACPI_STATUS             Status;
  
  
-@@ -205,8 +207,10 @@ AcpiExOpcode_2A_2T_1R (
- 
-         Status = AcpiUtDivide (Operand[0]->Integer.Value,
-                                Operand[1]->Integer.Value,
--                               &ReturnDesc1->Integer.Value,
--                               &ReturnDesc2->Integer.Value);
-+                               &ReturnValue1, &ReturnValue2);
+@@ -206,8 +208,10 @@ AcpiExOpcode_2A_2T_1R (
+         Status = AcpiUtDivide (
+             Operand[0]->Integer.Value,
+             Operand[1]->Integer.Value,
+-            &ReturnDesc1->Integer.Value,
+-            &ReturnDesc2->Integer.Value);
++            &ReturnValue1, &ReturnValue2);
 +        ReturnDesc1->Integer.Value = ReturnValue1;
 +        ReturnDesc2->Integer.Value = ReturnValue2;
 +
          if (ACPI_FAILURE (Status))
          {
              goto Cleanup;
-@@ -280,6 +284,7 @@ AcpiExOpcode_2A_1T_1R (
+@@ -282,6 +286,7 @@ AcpiExOpcode_2A_1T_1R (
      ACPI_OPERAND_OBJECT     **Operand = &WalkState->Operands[0];
      ACPI_OPERAND_OBJECT     *ReturnDesc = NULL;
      UINT64                  Index;
@@ -105,20 +105,20 @@ Index: acpica-unix2-20150930/source/components/executer/exoparg2.c
      ACPI_STATUS             Status = AE_OK;
      ACPI_SIZE               Length = 0;
  
-@@ -323,7 +328,8 @@ AcpiExOpcode_2A_1T_1R (
-         Status = AcpiUtDivide (Operand[0]->Integer.Value,
-                                Operand[1]->Integer.Value,
-                                NULL,
--                               &ReturnDesc->Integer.Value);
-+                               &ReturnValue);
+@@ -327,7 +332,8 @@ AcpiExOpcode_2A_1T_1R (
+             Operand[0]->Integer.Value,
+             Operand[1]->Integer.Value,
+             NULL,
+-            &ReturnDesc->Integer.Value);
++            &ReturnValue);
 +        ReturnDesc->Integer.Value = ReturnValue;
          break;
  
      case AML_CONCAT_OP: /* Concatenate (Data1, Data2, Result) */
-Index: acpica-unix2-20150930/source/include/actypes.h
+Index: acpica-unix2-20151124/source/include/actypes.h
 ===================================================================
---- acpica-unix2-20150930.orig/source/include/actypes.h
-+++ acpica-unix2-20150930/source/include/actypes.h
+--- acpica-unix2-20151124.orig/source/include/actypes.h
++++ acpica-unix2-20151124/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 9daee2f..8a69f40 100644
--- a/f23-harden.patch
+++ b/f23-harden.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20150930/generate/unix/Makefile.config
+Index: acpica-unix2-20151124/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix2-20150930.orig/generate/unix/Makefile.config
-+++ acpica-unix2-20150930/generate/unix/Makefile.config
+--- acpica-unix2-20151124.orig/generate/unix/Makefile.config
++++ acpica-unix2-20151124/generate/unix/Makefile.config
 @@ -167,6 +167,8 @@ ifneq ($(NOFORTIFY),TRUE)
  OPT_CFLAGS += -D_FORTIFY_SOURCE=2
  endif
@@ -11,11 +11,11 @@ Index: acpica-unix2-20150930/generate/unix/Makefile.config
  CFLAGS += \
      -D$(HOST)\
      -D_GNU_SOURCE\
-Index: acpica-unix2-20150930/generate/unix/iasl/Makefile
+Index: acpica-unix2-20151124/generate/unix/iasl/Makefile
 ===================================================================
---- acpica-unix2-20150930.orig/generate/unix/iasl/Makefile
-+++ acpica-unix2-20150930/generate/unix/iasl/Makefile
-@@ -305,20 +305,21 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
+--- acpica-unix2-20151124.orig/generate/unix/iasl/Makefile
++++ acpica-unix2-20151124/generate/unix/iasl/Makefile
+@@ -309,20 +309,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/int-format.patch b/int-format.patch
index ee056d3..ae3e381 100644
--- a/int-format.patch
+++ b/int-format.patch
@@ -1,8 +1,8 @@
-Index: acpica-unix2-20150930/source/compiler/aslcompile.c
+Index: acpica-unix2-20151124/source/compiler/aslcompile.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslcompile.c
-+++ acpica-unix2-20150930/source/compiler/aslcompile.c
-@@ -699,7 +699,7 @@ CmCleanupAndExit (
+--- acpica-unix2-20151124.orig/source/compiler/aslcompile.c
++++ acpica-unix2-20151124/source/compiler/aslcompile.c
+@@ -702,7 +702,7 @@ CmCleanupAndExit (
  
      if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
      {
@@ -11,10 +11,10 @@ Index: acpica-unix2-20150930/source/compiler/aslcompile.c
              ASL_MAX_ERROR_COUNT);
      }
  
-Index: acpica-unix2-20150930/source/tools/acpiexec/aemain.c
+Index: acpica-unix2-20151124/source/tools/acpiexec/aemain.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/tools/acpiexec/aemain.c
-+++ acpica-unix2-20150930/source/tools/acpiexec/aemain.c
+--- acpica-unix2-20151124.orig/source/tools/acpiexec/aemain.c
++++ acpica-unix2-20151124/source/tools/acpiexec/aemain.c
 @@ -203,7 +203,7 @@ AeDoOptions (
  
          if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1))
@@ -24,11 +24,11 @@ Index: acpica-unix2-20150930/source/tools/acpiexec/aemain.c
                  (UINT32) strlen (AcpiGbl_Optarg), (AE_BUFFER_SIZE -1));
              return (-1);
          }
-Index: acpica-unix2-20150930/source/compiler/aslerror.c
+Index: acpica-unix2-20151124/source/compiler/aslerror.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslerror.c
-+++ acpica-unix2-20150930/source/compiler/aslerror.c
-@@ -685,7 +685,7 @@ AslCommonError (
+--- acpica-unix2-20151124.orig/source/compiler/aslerror.c
++++ acpica-unix2-20151124/source/compiler/aslerror.c
+@@ -687,7 +687,7 @@ AslCommonError (
      Gbl_ExceptionCount[Level]++;
      if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
      {
@@ -37,7 +37,7 @@ Index: acpica-unix2-20150930/source/compiler/aslerror.c
  
          Gbl_SourceLine = 0;
          Gbl_NextError = Gbl_ErrorLog;
-@@ -731,7 +731,7 @@ AslDisableException (
+@@ -733,7 +733,7 @@ AslDisableException (
  
      if (Gbl_DisabledMessagesIndex >= ASL_MAX_DISABLED_MESSAGES)
      {
@@ -46,10 +46,10 @@ Index: acpica-unix2-20150930/source/compiler/aslerror.c
              ASL_MAX_DISABLED_MESSAGES);
          return (AE_LIMIT);
      }
-Index: acpica-unix2-20150930/source/components/debugger/dbexec.c
+Index: acpica-unix2-20151124/source/components/debugger/dbexec.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/components/debugger/dbexec.c
-+++ acpica-unix2-20150930/source/components/debugger/dbexec.c
+--- acpica-unix2-20151124.orig/source/components/debugger/dbexec.c
++++ acpica-unix2-20151124/source/components/debugger/dbexec.c
 @@ -214,7 +214,7 @@ AcpiDbExecuteMethod (
              ACPI_ERROR ((AE_INFO,
                  "Possible overflow of internal debugger "
@@ -59,10 +59,10 @@ Index: acpica-unix2-20150930/source/components/debugger/dbexec.c
          }
      }
  
-Index: acpica-unix2-20150930/source/compiler/aslopt.c
+Index: acpica-unix2-20151124/source/compiler/aslopt.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslopt.c
-+++ acpica-unix2-20150930/source/compiler/aslopt.c
+--- acpica-unix2-20151124.orig/source/compiler/aslopt.c
++++ acpica-unix2-20151124/source/compiler/aslopt.c
 @@ -576,7 +576,7 @@ OptOptimizeNamePath (
      }
  
@@ -72,11 +72,11 @@ Index: acpica-unix2-20150930/source/compiler/aslopt.c
          Op->Asl.LogicalLineNumber,
          AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
          AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
-Index: acpica-unix2-20150930/source/components/dispatcher/dsmthdat.c
+Index: acpica-unix2-20151124/source/components/dispatcher/dsmthdat.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/components/dispatcher/dsmthdat.c
-+++ acpica-unix2-20150930/source/components/dispatcher/dsmthdat.c
-@@ -287,7 +287,7 @@ AcpiDsMethodDataGetNode (
+--- acpica-unix2-20151124.orig/source/components/dispatcher/dsmthdat.c
++++ acpica-unix2-20151124/source/components/dispatcher/dsmthdat.c
+@@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
          if (Index > ACPI_METHOD_MAX_LOCAL)
          {
              ACPI_ERROR ((AE_INFO,
@@ -85,7 +85,7 @@ Index: acpica-unix2-20150930/source/components/dispatcher/dsmthdat.c
                  Index, ACPI_METHOD_MAX_LOCAL));
              return_ACPI_STATUS (AE_AML_INVALID_INDEX);
          }
-@@ -302,7 +302,7 @@ AcpiDsMethodDataGetNode (
+@@ -306,7 +306,7 @@ AcpiDsMethodDataGetNode (
          if (Index > ACPI_METHOD_MAX_ARG)
          {
              ACPI_ERROR ((AE_INFO,
@@ -94,10 +94,10 @@ Index: acpica-unix2-20150930/source/components/dispatcher/dsmthdat.c
                  Index, ACPI_METHOD_MAX_ARG));
              return_ACPI_STATUS (AE_AML_INVALID_INDEX);
          }
-Index: acpica-unix2-20150930/source/compiler/aslpredef.c
+Index: acpica-unix2-20151124/source/compiler/aslpredef.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslpredef.c
-+++ acpica-unix2-20150930/source/compiler/aslpredef.c
+--- acpica-unix2-20151124.orig/source/compiler/aslpredef.c
++++ acpica-unix2-20151124/source/compiler/aslpredef.c
 @@ -114,7 +114,7 @@ ApCheckForPredefinedMethod (
  
          if (MethodInfo->NumArguments != 0)
@@ -107,11 +107,11 @@ Index: acpica-unix2-20150930/source/compiler/aslpredef.c
  
              AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op,
                  MsgBuffer);
-Index: acpica-unix2-20150930/source/compiler/aslprepkg.c
+Index: acpica-unix2-20151124/source/compiler/aslprepkg.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslprepkg.c
-+++ acpica-unix2-20150930/source/compiler/aslprepkg.c
-@@ -298,7 +298,7 @@ ApCheckPackage (
+--- acpica-unix2-20151124.orig/source/compiler/aslprepkg.c
++++ acpica-unix2-20151124/source/compiler/aslprepkg.c
+@@ -299,7 +299,7 @@ ApCheckPackage (
  
          if (Count & 1)
          {
@@ -120,11 +120,11 @@ Index: acpica-unix2-20150930/source/compiler/aslprepkg.c
                  Predefined->Info.Name, Count);
  
              AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
-Index: acpica-unix2-20150930/source/components/dispatcher/dsutils.c
+Index: acpica-unix2-20151124/source/components/dispatcher/dsutils.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix2-20150930/source/components/dispatcher/dsutils.c
-@@ -787,7 +787,7 @@ AcpiDsCreateOperands (
+--- acpica-unix2-20151124.orig/source/components/dispatcher/dsutils.c
++++ acpica-unix2-20151124/source/components/dispatcher/dsutils.c
+@@ -791,7 +791,7 @@ AcpiDsCreateOperands (
      }
  
      ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
@@ -133,11 +133,11 @@ Index: acpica-unix2-20150930/source/components/dispatcher/dsutils.c
          WalkState->NumOperands, ArgCount, Index));
  
      /* Create the interpreter arguments, in reverse order */
-Index: acpica-unix2-20150930/source/components/dispatcher/dswscope.c
+Index: acpica-unix2-20151124/source/components/dispatcher/dswscope.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/components/dispatcher/dswscope.c
-+++ acpica-unix2-20150930/source/components/dispatcher/dswscope.c
-@@ -148,7 +148,7 @@ AcpiDsScopeStackPush (
+--- acpica-unix2-20151124.orig/source/components/dispatcher/dswscope.c
++++ acpica-unix2-20151124/source/components/dispatcher/dswscope.c
+@@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
      WalkState->ScopeDepth++;
  
      ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
@@ -146,7 +146,7 @@ Index: acpica-unix2-20150930/source/components/dispatcher/dswscope.c
  
      OldScopeInfo = WalkState->ScopeInfo;
      if (OldScopeInfo)
-@@ -211,7 +211,7 @@ AcpiDsScopeStackPop (
+@@ -212,7 +212,7 @@ AcpiDsScopeStackPop (
      WalkState->ScopeDepth--;
  
      ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
@@ -155,10 +155,10 @@ Index: acpica-unix2-20150930/source/components/dispatcher/dswscope.c
          (UINT32) WalkState->ScopeDepth,
          AcpiUtGetNodeName (ScopeInfo->Scope.Node),
          AcpiUtGetTypeName (ScopeInfo->Common.Value)));
-Index: acpica-unix2-20150930/source/components/events/evgpe.c
+Index: acpica-unix2-20151124/source/components/events/evgpe.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/components/events/evgpe.c
-+++ acpica-unix2-20150930/source/components/events/evgpe.c
+--- acpica-unix2-20151124.orig/source/components/events/evgpe.c
++++ acpica-unix2-20151124/source/components/events/evgpe.c
 @@ -430,7 +430,7 @@ AcpiEvGpeDetect (
                      "Ignore disabled registers for GPE %02X-%02X: "
                      "RunEnable=%02X, WakeEnable=%02X\n",
@@ -177,11 +177,11 @@ Index: acpica-unix2-20150930/source/components/events/evgpe.c
                  StatusReg, EnableReg,
                  GpeRegisterInfo->EnableForRun,
                  GpeRegisterInfo->EnableForWake));
-Index: acpica-unix2-20150930/source/components/executer/exdump.c
+Index: acpica-unix2-20151124/source/components/executer/exdump.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/components/executer/exdump.c
-+++ acpica-unix2-20150930/source/components/executer/exdump.c
-@@ -664,7 +664,7 @@ AcpiExDumpOperand (
+--- acpica-unix2-20151124.orig/source/components/executer/exdump.c
++++ acpica-unix2-20151124/source/components/executer/exdump.c
+@@ -669,7 +669,7 @@ AcpiExDumpOperand (
      if (Depth > 0)
      {
          ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%*s[%u] %p ",
@@ -190,11 +190,11 @@ Index: acpica-unix2-20150930/source/components/executer/exdump.c
      }
      else
      {
-Index: acpica-unix2-20150930/source/components/executer/exnames.c
+Index: acpica-unix2-20151124/source/components/executer/exnames.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/components/executer/exnames.c
-+++ acpica-unix2-20150930/source/components/executer/exnames.c
-@@ -239,7 +239,7 @@ AcpiExNameSegment (
+--- acpica-unix2-20151124.orig/source/components/executer/exnames.c
++++ acpica-unix2-20151124/source/components/executer/exnames.c
+@@ -240,7 +240,7 @@ AcpiExNameSegment (
           */
          ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
              "Leading character is not alpha: %02Xh (not a name)\n",
@@ -203,7 +203,7 @@ Index: acpica-unix2-20150930/source/components/executer/exnames.c
          Status = AE_CTRL_PENDING;
      }
      else
-@@ -251,7 +251,7 @@ AcpiExNameSegment (
+@@ -252,7 +252,7 @@ AcpiExNameSegment (
          Status = AE_AML_BAD_NAME;
          ACPI_ERROR ((AE_INFO,
              "Bad character 0x%02x in name, at %p",
@@ -212,23 +212,25 @@ Index: acpica-unix2-20150930/source/components/executer/exnames.c
      }
  
      *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
-Index: acpica-unix2-20150930/source/components/executer/exfldio.c
+Index: acpica-unix2-20151124/source/components/executer/exfldio.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/components/executer/exfldio.c
-+++ acpica-unix2-20150930/source/components/executer/exfldio.c
-@@ -679,7 +679,7 @@ AcpiExWriteWithUpdateRule (
+--- acpica-unix2-20151124.orig/source/components/executer/exfldio.c
++++ acpica-unix2-20151124/source/components/executer/exfldio.c
+@@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
  
              ACPI_ERROR ((AE_INFO,
                  "Unknown UpdateRule value: 0x%X",
--                (ObjDesc->CommonField.FieldFlags & AML_FIELD_UPDATE_RULE_MASK)));
-+                (unsigned int) (ObjDesc->CommonField.FieldFlags & AML_FIELD_UPDATE_RULE_MASK)));
+-                (ObjDesc->CommonField.FieldFlags &
+-                    AML_FIELD_UPDATE_RULE_MASK)));
++                (unsigned int) (ObjDesc->CommonField.FieldFlags &
++                                   AML_FIELD_UPDATE_RULE_MASK)));
              return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
          }
      }
-Index: acpica-unix2-20150930/source/components/tables/tbfadt.c
+Index: acpica-unix2-20151124/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/components/tables/tbfadt.c
-+++ acpica-unix2-20150930/source/components/tables/tbfadt.c
+--- acpica-unix2-20151124.orig/source/components/tables/tbfadt.c
++++ acpica-unix2-20151124/source/components/tables/tbfadt.c
 @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
          if (!(Flags & ACPI_FADT_GPE_REGISTER))
          {
@@ -256,11 +258,11 @@ Index: acpica-unix2-20150930/source/components/tables/tbfadt.c
                      Name, Address32,
                      ACPI_FORMAT_UINT64 (Address64->Address),
                      AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
-Index: acpica-unix2-20150930/source/components/hardware/hwregs.c
+Index: acpica-unix2-20151124/source/components/hardware/hwregs.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/components/hardware/hwregs.c
-+++ acpica-unix2-20150930/source/components/hardware/hwregs.c
-@@ -299,7 +299,7 @@ AcpiHwClearAcpiStatus (
+--- acpica-unix2-20151124.orig/source/components/hardware/hwregs.c
++++ acpica-unix2-20151124/source/components/hardware/hwregs.c
+@@ -300,7 +300,7 @@ AcpiHwClearAcpiStatus (
  
  
      ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %8.8X%8.8X\n",
@@ -269,10 +271,10 @@ Index: acpica-unix2-20150930/source/components/hardware/hwregs.c
          ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
  
      LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
-Index: acpica-unix2-20150930/source/components/tables/tbxfroot.c
+Index: acpica-unix2-20151124/source/components/tables/tbxfroot.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/components/tables/tbxfroot.c
-+++ acpica-unix2-20150930/source/components/tables/tbxfroot.c
+--- acpica-unix2-20151124.orig/source/components/tables/tbxfroot.c
++++ acpica-unix2-20151124/source/components/tables/tbxfroot.c
 @@ -177,7 +177,7 @@ AcpiFindRootPointer (
      {
          ACPI_ERROR ((AE_INFO,
@@ -291,7 +293,7 @@ Index: acpica-unix2-20150930/source/components/tables/tbxfroot.c
  
              return_ACPI_STATUS (AE_NO_MEMORY);
          }
-@@ -234,7 +234,7 @@ AcpiFindRootPointer (
+@@ -236,7 +236,7 @@ AcpiFindRootPointer (
      {
          ACPI_ERROR ((AE_INFO,
              "Could not map memory at 0x%8.8X for length %u",
@@ -300,11 +302,11 @@ Index: acpica-unix2-20150930/source/components/tables/tbxfroot.c
  
          return_ACPI_STATUS (AE_NO_MEMORY);
      }
-Index: acpica-unix2-20150930/source/components/utilities/utownerid.c
+Index: acpica-unix2-20151124/source/components/utilities/utownerid.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/components/utilities/utownerid.c
-+++ acpica-unix2-20150930/source/components/utilities/utownerid.c
-@@ -230,7 +230,7 @@ AcpiUtReleaseOwnerId (
+--- acpica-unix2-20151124.orig/source/components/utilities/utownerid.c
++++ acpica-unix2-20151124/source/components/utilities/utownerid.c
+@@ -231,7 +231,7 @@ AcpiUtReleaseOwnerId (
      else
      {
          ACPI_ERROR ((AE_INFO,
diff --git a/name-miscompare.patch b/name-miscompare.patch
index 1e9a556..7e5cb5e 100644
--- a/name-miscompare.patch
+++ b/name-miscompare.patch
@@ -4,11 +4,11 @@ to be compared were being treated as 32-bit ints, and not strings.  Hence,
 the characters were re-ordered incorrectly, mismatching the assumptions
 made in the remainder of the function.
 
-Index: acpica-unix2-20150930/source/compiler/aslanalyze.c
+Index: acpica-unix2-20151124/source/compiler/aslanalyze.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslanalyze.c
-+++ acpica-unix2-20150930/source/compiler/aslanalyze.c
-@@ -445,7 +445,7 @@ ApCheckForGpeNameConflict (
+--- acpica-unix2-20151124.orig/source/compiler/aslanalyze.c
++++ acpica-unix2-20151124/source/compiler/aslanalyze.c
+@@ -446,7 +446,7 @@ ApCheckForGpeNameConflict (
  
      /* Need a null-terminated string version of NameSeg */
  
@@ -17,7 +17,7 @@ Index: acpica-unix2-20150930/source/compiler/aslanalyze.c
      Name[ACPI_NAME_SIZE] = 0;
  
      /*
-@@ -472,7 +472,7 @@ ApCheckForGpeNameConflict (
+@@ -473,7 +473,7 @@ ApCheckForGpeNameConflict (
       * We are now sure we have an _Lxx or _Exx.
       * Create the target name that would cause collision (Flip E/L)
       */
diff --git a/re-enable-big-endian.patch b/re-enable-big-endian.patch
index 007190c..c0e51a9 100644
--- a/re-enable-big-endian.patch
+++ b/re-enable-big-endian.patch
@@ -2,10 +2,10 @@ Re-enable use of these tools on big-endian machines.
 
 Al Stone <ahs3@redhat.com>
 
-Index: acpica-unix2-20150930/source/compiler/aslmain.c
+Index: acpica-unix2-20151124/source/compiler/aslmain.c
 ===================================================================
---- acpica-unix2-20150930.orig/source/compiler/aslmain.c
-+++ acpica-unix2-20150930/source/compiler/aslmain.c
+--- acpica-unix2-20151124.orig/source/compiler/aslmain.c
++++ acpica-unix2-20151124/source/compiler/aslmain.c
 @@ -340,18 +340,6 @@ main (
      int                     ReturnStatus = 0;
  
diff --git a/template.patch b/template.patch
index 8dde5e4..796a1d0 100644
--- a/template.patch
+++ b/template.patch
@@ -1,6 +1,7 @@
-diff -Naur acpica-unix2-20150930/tests/templates/Makefile acpica-unix2-20150930.patch/tests/templates/Makefile
---- acpica-unix2-20150930/tests/templates/Makefile	2015-09-30 13:15:56.000000000 -0600
-+++ acpica-unix2-20150930.patch/tests/templates/Makefile	2015-10-14 17:43:06.505805126 -0600
+Index: acpica-unix2-20151124/tests/templates/Makefile
+===================================================================
+--- acpica-unix2-20151124.orig/tests/templates/Makefile
++++ acpica-unix2-20151124/tests/templates/Makefile
 @@ -2,7 +2,7 @@
  PROG= templates