vendor/acpica/20150515

2 files changed, 14 insertions, 1 deletions

diff --git a/source/components/namespace/nsprepkg.c b/source/components/namespace/nsprepkg.c
index c6527cc5d995..599af7e6a563 100644
--- a/source/components/namespace/nsprepkg.c
+++ b/source/components/namespace/nsprepkg.c
@@ -321,6 +321,13 @@ AcpiNsCheckPackage (
         Status = AcpiNsCheckPackageList (Info, Package, Elements, Count);
         break;
 
+    case ACPI_PTYPE2_VAR_VAR:
+        /*
+         * Returns a variable list of packages, each with a variable list
+         * of objects.
+         */
+        break;
+
     case ACPI_PTYPE2_UUID_PAIR:
 
         /* The package must contain pairs of (UUID + type) */
@@ -490,6 +497,12 @@ AcpiNsCheckPackageList (
             }
             break;
 
+        case ACPI_PTYPE2_VAR_VAR:
+            /*
+             * Each subpackage has a fixed or variable number of elements
+             */
+            break;
+
         case ACPI_PTYPE2_FIXED:
 
             /* Each subpackage has a fixed length */
diff --git a/source/components/namespace/nsrepair.c b/source/components/namespace/nsrepair.c
index df0e1e4c5599..160d84308561 100644
--- a/source/components/namespace/nsrepair.c
+++ b/source/components/namespace/nsrepair.c
@@ -523,10 +523,10 @@ AcpiNsRemoveNullElements (
     case ACPI_PTYPE2_MIN:
     case ACPI_PTYPE2_REV_FIXED:
     case ACPI_PTYPE2_FIX_VAR:
-
         break;
 
     default:
+    case ACPI_PTYPE2_VAR_VAR:
     case ACPI_PTYPE1_FIXED:
     case ACPI_PTYPE1_OPTION:
         return;