4 files changed, 13 insertions, 2 deletions
diff --git a/source/compiler/aslmessages.c b/source/compiler/aslmessages.c
index efa58cb50cff..14e140b2f1ba 100644
--- a/source/compiler/aslmessages.c
+++ b/source/compiler/aslmessages.c
@@ -358,7 +358,8 @@ const char                      *AslCompilerMsgs [] =
 /*    ASL_MSG_OEM_TABLE_ID */               "Invalid OEM Table ID",
 /*    ASL_MSG_OEM_ID */                     "Invalid OEM ID",
 /*    ASL_MSG_UNLOAD */                     "Unload is not supported by all operating systems",
-/*    ASL_MSG_OFFSET */                     "Unnecessary/redundant use of Offset operator"
+/*    ASL_MSG_OFFSET */                     "Unnecessary/redundant use of Offset operator",
+/*    ASL_MSG_LONG_SLEEP */                 "Very long Sleep, greater than 1 second"
 };
 
 /* Table compiler */
diff --git a/source/compiler/aslmessages.h b/source/compiler/aslmessages.h
index 5030a81780da..907744a23a57 100644
--- a/source/compiler/aslmessages.h
+++ b/source/compiler/aslmessages.h
@@ -361,6 +361,7 @@ typedef enum
     ASL_MSG_OEM_ID,
     ASL_MSG_UNLOAD,
     ASL_MSG_OFFSET,
+    ASL_MSG_LONG_SLEEP,
 
     /* These messages are used by the Data Table compiler only */
 
diff --git a/source/compiler/aslopt.c b/source/compiler/aslopt.c
index 4e53a4b0ac4c..0f5ce5fd2845 100644
--- a/source/compiler/aslopt.c
+++ b/source/compiler/aslopt.c
@@ -522,7 +522,6 @@ OptBuildShortestPath (
 
 Cleanup:
 
-    ACPI_FREE (NewPathExternal);
     return (Status);
 }
 
diff --git a/source/compiler/asltransform.c b/source/compiler/asltransform.c
index 3249e367957c..324b0364dc9d 100644
--- a/source/compiler/asltransform.c
+++ b/source/compiler/asltransform.c
@@ -501,6 +501,16 @@ TrTransformSubtree (
         AslError (ASL_WARNING, ASL_MSG_UNLOAD, Op, NULL);
         break;
 
+    case PARSEOP_SLEEP:
+
+        /* Remark for very long sleep values */
+
+        if (Op->Asl.Child->Asl.Value.Integer > 1000)
+        {
+            AslError (ASL_REMARK, ASL_MSG_LONG_SLEEP, Op, NULL);
+        }
+        break;
+
     default:
 
         /* Nothing to do here for other opcodes */