1 files changed, 10 insertions, 1 deletions
diff --git a/source/tools/acpiexec/aeexception.c b/source/tools/acpiexec/aeexception.c
index 62e9db0a0122..2e44dbc504a3 100644
--- a/source/tools/acpiexec/aeexception.c
+++ b/source/tools/acpiexec/aeexception.c
@@ -196,13 +196,22 @@ AeExceptionHandler (
     Exception = AcpiFormatException (AmlStatus);
     AcpiOsPrintf (AE_PREFIX
         "Exception %s during execution\n", Exception);
+
     if (Name)
     {
         AcpiOsPrintf (AE_PREFIX
-            "Evaluating Method or Node: [%4.4s]",
+            "Evaluating Method or Node: [%4.4s]\n",
             (char *) &Name);
     }
 
+    /* Be terse about loop timeouts */
+
+    if ((AmlStatus == AE_AML_LOOP_TIMEOUT) && AcpiGbl_AbortLoopOnTimeout)
+    {
+        AcpiOsPrintf (AE_PREFIX "Aborting loop after timeout\n");
+        return (AE_OK);
+    }
+
     AcpiOsPrintf ("\n" AE_PREFIX
         "AML Opcode [%s], Method Offset ~%5.5X\n",
         AcpiPsGetOpcodeName (Opcode), AmlOffset);