1 files changed, 55 insertions, 73 deletions
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h
index e5a890ffeb02..84f5cb242863 100644
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
@@ -76,25 +76,21 @@
 #define AE_STACK_OVERFLOW               (acpi_status) (0x000C | AE_CODE_ENVIRONMENTAL)
 #define AE_STACK_UNDERFLOW              (acpi_status) (0x000D | AE_CODE_ENVIRONMENTAL)
 #define AE_NOT_IMPLEMENTED              (acpi_status) (0x000E | AE_CODE_ENVIRONMENTAL)
-#define AE_VERSION_MISMATCH             (acpi_status) (0x000F | AE_CODE_ENVIRONMENTAL)
+#define AE_SUPPORT                      (acpi_status) (0x000F | AE_CODE_ENVIRONMENTAL)
-#define AE_SUPPORT                      (acpi_status) (0x0010 | AE_CODE_ENVIRONMENTAL)
+#define AE_LIMIT                        (acpi_status) (0x0010 | AE_CODE_ENVIRONMENTAL)
-#define AE_SHARE                        (acpi_status) (0x0011 | AE_CODE_ENVIRONMENTAL)
+#define AE_TIME                         (acpi_status) (0x0011 | AE_CODE_ENVIRONMENTAL)
-#define AE_LIMIT                        (acpi_status) (0x0012 | AE_CODE_ENVIRONMENTAL)
+#define AE_ACQUIRE_DEADLOCK             (acpi_status) (0x0012 | AE_CODE_ENVIRONMENTAL)
-#define AE_TIME                         (acpi_status) (0x0013 | AE_CODE_ENVIRONMENTAL)
+#define AE_RELEASE_DEADLOCK             (acpi_status) (0x0013 | AE_CODE_ENVIRONMENTAL)
-#define AE_UNKNOWN_STATUS               (acpi_status) (0x0014 | AE_CODE_ENVIRONMENTAL)
+#define AE_NOT_ACQUIRED                 (acpi_status) (0x0014 | AE_CODE_ENVIRONMENTAL)
-#define AE_ACQUIRE_DEADLOCK             (acpi_status) (0x0015 | AE_CODE_ENVIRONMENTAL)
+#define AE_ALREADY_ACQUIRED             (acpi_status) (0x0015 | AE_CODE_ENVIRONMENTAL)
-#define AE_RELEASE_DEADLOCK             (acpi_status) (0x0016 | AE_CODE_ENVIRONMENTAL)
+#define AE_NO_HARDWARE_RESPONSE         (acpi_status) (0x0016 | AE_CODE_ENVIRONMENTAL)
-#define AE_NOT_ACQUIRED                 (acpi_status) (0x0017 | AE_CODE_ENVIRONMENTAL)
+#define AE_NO_GLOBAL_LOCK               (acpi_status) (0x0017 | AE_CODE_ENVIRONMENTAL)
-#define AE_ALREADY_ACQUIRED             (acpi_status) (0x0018 | AE_CODE_ENVIRONMENTAL)
+#define AE_ABORT_METHOD                 (acpi_status) (0x0018 | AE_CODE_ENVIRONMENTAL)
-#define AE_NO_HARDWARE_RESPONSE         (acpi_status) (0x0019 | AE_CODE_ENVIRONMENTAL)
+#define AE_SAME_HANDLER                 (acpi_status) (0x0019 | AE_CODE_ENVIRONMENTAL)
-#define AE_NO_GLOBAL_LOCK               (acpi_status) (0x001A | AE_CODE_ENVIRONMENTAL)
+#define AE_WAKE_ONLY_GPE                (acpi_status) (0x001A | AE_CODE_ENVIRONMENTAL)
-#define AE_LOGICAL_ADDRESS              (acpi_status) (0x001B | AE_CODE_ENVIRONMENTAL)
+#define AE_OWNER_ID_LIMIT               (acpi_status) (0x001B | AE_CODE_ENVIRONMENTAL)
-#define AE_ABORT_METHOD                 (acpi_status) (0x001C | AE_CODE_ENVIRONMENTAL)
-#define AE_SAME_HANDLER                 (acpi_status) (0x001D | AE_CODE_ENVIRONMENTAL)
-#define AE_WAKE_ONLY_GPE                (acpi_status) (0x001E | AE_CODE_ENVIRONMENTAL)
-#define AE_OWNER_ID_LIMIT               (acpi_status) (0x001F | AE_CODE_ENVIRONMENTAL)
-#define AE_CODE_ENV_MAX                 0x001F
+#define AE_CODE_ENV_MAX                 0x001B
 /*
 * Programmer exceptions
@@ -103,14 +99,12 @@
 #define AE_BAD_CHARACTER                (acpi_status) (0x0002 | AE_CODE_PROGRAMMER)
 #define AE_BAD_PATHNAME                 (acpi_status) (0x0003 | AE_CODE_PROGRAMMER)
 #define AE_BAD_DATA                     (acpi_status) (0x0004 | AE_CODE_PROGRAMMER)
-#define AE_BAD_ADDRESS                  (acpi_status) (0x0005 | AE_CODE_PROGRAMMER)
+#define AE_BAD_HEX_CONSTANT             (acpi_status) (0x0005 | AE_CODE_PROGRAMMER)
-#define AE_ALIGNMENT                    (acpi_status) (0x0006 | AE_CODE_PROGRAMMER)
+#define AE_BAD_OCTAL_CONSTANT           (acpi_status) (0x0006 | AE_CODE_PROGRAMMER)
-#define AE_BAD_HEX_CONSTANT             (acpi_status) (0x0007 | AE_CODE_PROGRAMMER)
+#define AE_BAD_DECIMAL_CONSTANT         (acpi_status) (0x0007 | AE_CODE_PROGRAMMER)
-#define AE_BAD_OCTAL_CONSTANT           (acpi_status) (0x0008 | AE_CODE_PROGRAMMER)
+#define AE_MISSING_ARGUMENTS            (acpi_status) (0x0008 | AE_CODE_PROGRAMMER)
-#define AE_BAD_DECIMAL_CONSTANT         (acpi_status) (0x0009 | AE_CODE_PROGRAMMER)
-#define AE_MISSING_ARGUMENTS            (acpi_status) (0x000A | AE_CODE_PROGRAMMER)
-#define AE_CODE_PGM_MAX                 0x000A
+#define AE_CODE_PGM_MAX                 0x0008
 /*
 * Acpi table exceptions
@@ -119,51 +113,48 @@
 #define AE_BAD_HEADER                   (acpi_status) (0x0002 | AE_CODE_ACPI_TABLES)
 #define AE_BAD_CHECKSUM                 (acpi_status) (0x0003 | AE_CODE_ACPI_TABLES)
 #define AE_BAD_VALUE                    (acpi_status) (0x0004 | AE_CODE_ACPI_TABLES)
-#define AE_TABLE_NOT_SUPPORTED          (acpi_status) (0x0005 | AE_CODE_ACPI_TABLES)
+#define AE_INVALID_TABLE_LENGTH         (acpi_status) (0x0005 | AE_CODE_ACPI_TABLES)
-#define AE_INVALID_TABLE_LENGTH         (acpi_status) (0x0006 | AE_CODE_ACPI_TABLES)
-#define AE_CODE_TBL_MAX                 0x0006
+#define AE_CODE_TBL_MAX                 0x0005
 /*
 * AML exceptions.  These are caused by problems with
 * the actual AML byte stream
 */
-#define AE_AML_ERROR                    (acpi_status) (0x0001 | AE_CODE_AML)
+#define AE_AML_BAD_OPCODE               (acpi_status) (0x0001 | AE_CODE_AML)
-#define AE_AML_PARSE                    (acpi_status) (0x0002 | AE_CODE_AML)
+#define AE_AML_NO_OPERAND               (acpi_status) (0x0002 | AE_CODE_AML)
-#define AE_AML_BAD_OPCODE               (acpi_status) (0x0003 | AE_CODE_AML)
+#define AE_AML_OPERAND_TYPE             (acpi_status) (0x0003 | AE_CODE_AML)
-#define AE_AML_NO_OPERAND               (acpi_status) (0x0004 | AE_CODE_AML)
+#define AE_AML_OPERAND_VALUE            (acpi_status) (0x0004 | AE_CODE_AML)
-#define AE_AML_OPERAND_TYPE             (acpi_status) (0x0005 | AE_CODE_AML)
+#define AE_AML_UNINITIALIZED_LOCAL      (acpi_status) (0x0005 | AE_CODE_AML)
-#define AE_AML_OPERAND_VALUE            (acpi_status) (0x0006 | AE_CODE_AML)
+#define AE_AML_UNINITIALIZED_ARG        (acpi_status) (0x0006 | AE_CODE_AML)
-#define AE_AML_UNINITIALIZED_LOCAL      (acpi_status) (0x0007 | AE_CODE_AML)
+#define AE_AML_UNINITIALIZED_ELEMENT    (acpi_status) (0x0007 | AE_CODE_AML)
-#define AE_AML_UNINITIALIZED_ARG        (acpi_status) (0x0008 | AE_CODE_AML)
+#define AE_AML_NUMERIC_OVERFLOW         (acpi_status) (0x0008 | AE_CODE_AML)
-#define AE_AML_UNINITIALIZED_ELEMENT    (acpi_status) (0x0009 | AE_CODE_AML)
+#define AE_AML_REGION_LIMIT             (acpi_status) (0x0009 | AE_CODE_AML)
-#define AE_AML_NUMERIC_OVERFLOW         (acpi_status) (0x000A | AE_CODE_AML)
+#define AE_AML_BUFFER_LIMIT             (acpi_status) (0x000A | AE_CODE_AML)
-#define AE_AML_REGION_LIMIT             (acpi_status) (0x000B | AE_CODE_AML)
+#define AE_AML_PACKAGE_LIMIT            (acpi_status) (0x000B | AE_CODE_AML)
-#define AE_AML_BUFFER_LIMIT             (acpi_status) (0x000C | AE_CODE_AML)
+#define AE_AML_DIVIDE_BY_ZERO           (acpi_status) (0x000C | AE_CODE_AML)
-#define AE_AML_PACKAGE_LIMIT            (acpi_status) (0x000D | AE_CODE_AML)
+#define AE_AML_BAD_NAME                 (acpi_status) (0x000D | AE_CODE_AML)
-#define AE_AML_DIVIDE_BY_ZERO           (acpi_status) (0x000E | AE_CODE_AML)
+#define AE_AML_NAME_NOT_FOUND           (acpi_status) (0x000E | AE_CODE_AML)
-#define AE_AML_BAD_NAME                 (acpi_status) (0x000F | AE_CODE_AML)
+#define AE_AML_INTERNAL                 (acpi_status) (0x000F | AE_CODE_AML)
-#define AE_AML_NAME_NOT_FOUND           (acpi_status) (0x0010 | AE_CODE_AML)
+#define AE_AML_INVALID_SPACE_ID         (acpi_status) (0x0010 | AE_CODE_AML)
-#define AE_AML_INTERNAL                 (acpi_status) (0x0011 | AE_CODE_AML)
+#define AE_AML_STRING_LIMIT             (acpi_status) (0x0011 | AE_CODE_AML)
-#define AE_AML_INVALID_SPACE_ID         (acpi_status) (0x0012 | AE_CODE_AML)
+#define AE_AML_NO_RETURN_VALUE          (acpi_status) (0x0012 | AE_CODE_AML)
-#define AE_AML_STRING_LIMIT             (acpi_status) (0x0013 | AE_CODE_AML)
+#define AE_AML_METHOD_LIMIT             (acpi_status) (0x0013 | AE_CODE_AML)
-#define AE_AML_NO_RETURN_VALUE          (acpi_status) (0x0014 | AE_CODE_AML)
+#define AE_AML_NOT_OWNER                (acpi_status) (0x0014 | AE_CODE_AML)
-#define AE_AML_METHOD_LIMIT             (acpi_status) (0x0015 | AE_CODE_AML)
+#define AE_AML_MUTEX_ORDER              (acpi_status) (0x0015 | AE_CODE_AML)
-#define AE_AML_NOT_OWNER                (acpi_status) (0x0016 | AE_CODE_AML)
+#define AE_AML_MUTEX_NOT_ACQUIRED       (acpi_status) (0x0016 | AE_CODE_AML)
-#define AE_AML_MUTEX_ORDER              (acpi_status) (0x0017 | AE_CODE_AML)
+#define AE_AML_INVALID_RESOURCE_TYPE    (acpi_status) (0x0017 | AE_CODE_AML)
-#define AE_AML_MUTEX_NOT_ACQUIRED       (acpi_status) (0x0018 | AE_CODE_AML)
+#define AE_AML_INVALID_INDEX            (acpi_status) (0x0018 | AE_CODE_AML)
-#define AE_AML_INVALID_RESOURCE_TYPE    (acpi_status) (0x0019 | AE_CODE_AML)
+#define AE_AML_REGISTER_LIMIT           (acpi_status) (0x0019 | AE_CODE_AML)
-#define AE_AML_INVALID_INDEX            (acpi_status) (0x001A | AE_CODE_AML)
+#define AE_AML_NO_WHILE                 (acpi_status) (0x001A | AE_CODE_AML)
-#define AE_AML_REGISTER_LIMIT           (acpi_status) (0x001B | AE_CODE_AML)
+#define AE_AML_ALIGNMENT                (acpi_status) (0x001B | AE_CODE_AML)
-#define AE_AML_NO_WHILE                 (acpi_status) (0x001C | AE_CODE_AML)
+#define AE_AML_NO_RESOURCE_END_TAG      (acpi_status) (0x001C | AE_CODE_AML)
-#define AE_AML_ALIGNMENT                (acpi_status) (0x001D | AE_CODE_AML)
+#define AE_AML_BAD_RESOURCE_VALUE       (acpi_status) (0x001D | AE_CODE_AML)
-#define AE_AML_NO_RESOURCE_END_TAG      (acpi_status) (0x001E | AE_CODE_AML)
+#define AE_AML_CIRCULAR_REFERENCE       (acpi_status) (0x001E | AE_CODE_AML)
-#define AE_AML_BAD_RESOURCE_VALUE       (acpi_status) (0x001F | AE_CODE_AML)
+#define AE_AML_BAD_RESOURCE_LENGTH      (acpi_status) (0x001F | AE_CODE_AML)
-#define AE_AML_CIRCULAR_REFERENCE       (acpi_status) (0x0020 | AE_CODE_AML)
+#define AE_AML_ILLEGAL_ADDRESS          (acpi_status) (0x0020 | AE_CODE_AML)
-#define AE_AML_BAD_RESOURCE_LENGTH      (acpi_status) (0x0021 | AE_CODE_AML)
-#define AE_AML_ILLEGAL_ADDRESS          (acpi_status) (0x0022 | AE_CODE_AML)
-#define AE_CODE_AML_MAX                 0x0022
+#define AE_CODE_AML_MAX                 0x0020
 /*
 * Internal exceptions used for control
@@ -206,19 +197,15 @@ char const *acpi_gbl_exception_names_env[] = {
        "AE_STACK_OVERFLOW",
        "AE_STACK_UNDERFLOW",
        "AE_NOT_IMPLEMENTED",
-        "AE_VERSION_MISMATCH",
        "AE_SUPPORT",
-        "AE_SHARE",
        "AE_LIMIT",
        "AE_TIME",
-        "AE_UNKNOWN_STATUS",
        "AE_ACQUIRE_DEADLOCK",
        "AE_RELEASE_DEADLOCK",
        "AE_NOT_ACQUIRED",
        "AE_ALREADY_ACQUIRED",
        "AE_NO_HARDWARE_RESPONSE",
        "AE_NO_GLOBAL_LOCK",
-        "AE_LOGICAL_ADDRESS",
        "AE_ABORT_METHOD",
        "AE_SAME_HANDLER",
        "AE_WAKE_ONLY_GPE",
@@ -231,8 +218,6 @@ char const *acpi_gbl_exception_names_pgm[] = {
        "AE_BAD_CHARACTER",
        "AE_BAD_PATHNAME",
        "AE_BAD_DATA",
-        "AE_BAD_ADDRESS",
-        "AE_ALIGNMENT",
        "AE_BAD_HEX_CONSTANT",
        "AE_BAD_OCTAL_CONSTANT",
        "AE_BAD_DECIMAL_CONSTANT",
@@ -245,14 +230,11 @@ char const *acpi_gbl_exception_names_tbl[] = {
        "AE_BAD_HEADER",
        "AE_BAD_CHECKSUM",
        "AE_BAD_VALUE",
-        "AE_TABLE_NOT_SUPPORTED",
        "AE_INVALID_TABLE_LENGTH"
 };
 char const *acpi_gbl_exception_names_aml[] = {
        NULL,
-        "AE_AML_ERROR",
-        "AE_AML_PARSE",
        "AE_AML_BAD_OPCODE",
        "AE_AML_NO_OPERAND",
        "AE_AML_OPERAND_TYPE",
@@ -284,7 +266,7 @@ char const *acpi_gbl_exception_names_aml[] = {
        "AE_AML_BAD_RESOURCE_VALUE",
        "AE_AML_CIRCULAR_REFERENCE",
        "AE_AML_BAD_RESOURCE_LENGTH",
-        "AE_AML_ILLEGAL_ADDRESS"
+        "AE_AML_ILLEGAL_ADDRESS",
 };
 char const *acpi_gbl_exception_names_ctrl[] = {

diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h index e5a890ffeb02..84f5cb242863 100644 --- a/include/acpi/acexcep.h +++ b/include/acpi/acexcep.h
@@ -76,25 +76,21 @@
76	#define AE_STACK_OVERFLOW (acpi_status) (0x000C \| AE_CODE_ENVIRONMENTAL)	76	#define AE_STACK_OVERFLOW (acpi_status) (0x000C \| AE_CODE_ENVIRONMENTAL)
77	#define AE_STACK_UNDERFLOW (acpi_status) (0x000D \| AE_CODE_ENVIRONMENTAL)	77	#define AE_STACK_UNDERFLOW (acpi_status) (0x000D \| AE_CODE_ENVIRONMENTAL)
78	#define AE_NOT_IMPLEMENTED (acpi_status) (0x000E \| AE_CODE_ENVIRONMENTAL)	78	#define AE_NOT_IMPLEMENTED (acpi_status) (0x000E \| AE_CODE_ENVIRONMENTAL)
79	#define AE_VERSION_MISMATCH (acpi_status) (0x000F \| AE_CODE_ENVIRONMENTAL)	79	#define AE_SUPPORT (acpi_status) (0x000F \| AE_CODE_ENVIRONMENTAL)
80	#define AE_SUPPORT (acpi_status) (0x0010 \| AE_CODE_ENVIRONMENTAL)	80	#define AE_LIMIT (acpi_status) (0x0010 \| AE_CODE_ENVIRONMENTAL)
81	#define AE_SHARE (acpi_status) (0x0011 \| AE_CODE_ENVIRONMENTAL)	81	#define AE_TIME (acpi_status) (0x0011 \| AE_CODE_ENVIRONMENTAL)
82	#define AE_LIMIT (acpi_status) (0x0012 \| AE_CODE_ENVIRONMENTAL)	82	#define AE_ACQUIRE_DEADLOCK (acpi_status) (0x0012 \| AE_CODE_ENVIRONMENTAL)
83	#define AE_TIME (acpi_status) (0x0013 \| AE_CODE_ENVIRONMENTAL)	83	#define AE_RELEASE_DEADLOCK (acpi_status) (0x0013 \| AE_CODE_ENVIRONMENTAL)
84	#define AE_UNKNOWN_STATUS (acpi_status) (0x0014 \| AE_CODE_ENVIRONMENTAL)	84	#define AE_NOT_ACQUIRED (acpi_status) (0x0014 \| AE_CODE_ENVIRONMENTAL)
85	#define AE_ACQUIRE_DEADLOCK (acpi_status) (0x0015 \| AE_CODE_ENVIRONMENTAL)	85	#define AE_ALREADY_ACQUIRED (acpi_status) (0x0015 \| AE_CODE_ENVIRONMENTAL)
86	#define AE_RELEASE_DEADLOCK (acpi_status) (0x0016 \| AE_CODE_ENVIRONMENTAL)	86	#define AE_NO_HARDWARE_RESPONSE (acpi_status) (0x0016 \| AE_CODE_ENVIRONMENTAL)
87	#define AE_NOT_ACQUIRED (acpi_status) (0x0017 \| AE_CODE_ENVIRONMENTAL)	87	#define AE_NO_GLOBAL_LOCK (acpi_status) (0x0017 \| AE_CODE_ENVIRONMENTAL)
88	#define AE_ALREADY_ACQUIRED (acpi_status) (0x0018 \| AE_CODE_ENVIRONMENTAL)	88	#define AE_ABORT_METHOD (acpi_status) (0x0018 \| AE_CODE_ENVIRONMENTAL)
89	#define AE_NO_HARDWARE_RESPONSE (acpi_status) (0x0019 \| AE_CODE_ENVIRONMENTAL)	89	#define AE_SAME_HANDLER (acpi_status) (0x0019 \| AE_CODE_ENVIRONMENTAL)
90	#define AE_NO_GLOBAL_LOCK (acpi_status) (0x001A \| AE_CODE_ENVIRONMENTAL)	90	#define AE_WAKE_ONLY_GPE (acpi_status) (0x001A \| AE_CODE_ENVIRONMENTAL)
91	#define AE_LOGICAL_ADDRESS (acpi_status) (0x001B \| AE_CODE_ENVIRONMENTAL)	91	#define AE_OWNER_ID_LIMIT (acpi_status) (0x001B \| AE_CODE_ENVIRONMENTAL)
92	#define AE_ABORT_METHOD (acpi_status) (0x001C \| AE_CODE_ENVIRONMENTAL)
93	#define AE_SAME_HANDLER (acpi_status) (0x001D \| AE_CODE_ENVIRONMENTAL)
94	#define AE_WAKE_ONLY_GPE (acpi_status) (0x001E \| AE_CODE_ENVIRONMENTAL)
95	#define AE_OWNER_ID_LIMIT (acpi_status) (0x001F \| AE_CODE_ENVIRONMENTAL)
96		92
97	#define AE_CODE_ENV_MAX 0x001F	93	#define AE_CODE_ENV_MAX 0x001B
98		94
99	/*	95	/*
100	* Programmer exceptions	96	* Programmer exceptions
@@ -103,14 +99,12 @@
103	#define AE_BAD_CHARACTER (acpi_status) (0x0002 \| AE_CODE_PROGRAMMER)	99	#define AE_BAD_CHARACTER (acpi_status) (0x0002 \| AE_CODE_PROGRAMMER)
104	#define AE_BAD_PATHNAME (acpi_status) (0x0003 \| AE_CODE_PROGRAMMER)	100	#define AE_BAD_PATHNAME (acpi_status) (0x0003 \| AE_CODE_PROGRAMMER)
105	#define AE_BAD_DATA (acpi_status) (0x0004 \| AE_CODE_PROGRAMMER)	101	#define AE_BAD_DATA (acpi_status) (0x0004 \| AE_CODE_PROGRAMMER)
106	#define AE_BAD_ADDRESS (acpi_status) (0x0005 \| AE_CODE_PROGRAMMER)	102	#define AE_BAD_HEX_CONSTANT (acpi_status) (0x0005 \| AE_CODE_PROGRAMMER)
107	#define AE_ALIGNMENT (acpi_status) (0x0006 \| AE_CODE_PROGRAMMER)	103	#define AE_BAD_OCTAL_CONSTANT (acpi_status) (0x0006 \| AE_CODE_PROGRAMMER)
108	#define AE_BAD_HEX_CONSTANT (acpi_status) (0x0007 \| AE_CODE_PROGRAMMER)	104	#define AE_BAD_DECIMAL_CONSTANT (acpi_status) (0x0007 \| AE_CODE_PROGRAMMER)
109	#define AE_BAD_OCTAL_CONSTANT (acpi_status) (0x0008 \| AE_CODE_PROGRAMMER)	105	#define AE_MISSING_ARGUMENTS (acpi_status) (0x0008 \| AE_CODE_PROGRAMMER)
110	#define AE_BAD_DECIMAL_CONSTANT (acpi_status) (0x0009 \| AE_CODE_PROGRAMMER)
111	#define AE_MISSING_ARGUMENTS (acpi_status) (0x000A \| AE_CODE_PROGRAMMER)
112		106
113	#define AE_CODE_PGM_MAX 0x000A	107	#define AE_CODE_PGM_MAX 0x0008
114		108
115	/*	109	/*
116	* Acpi table exceptions	110	* Acpi table exceptions
@@ -119,51 +113,48 @@
119	#define AE_BAD_HEADER (acpi_status) (0x0002 \| AE_CODE_ACPI_TABLES)	113	#define AE_BAD_HEADER (acpi_status) (0x0002 \| AE_CODE_ACPI_TABLES)
120	#define AE_BAD_CHECKSUM (acpi_status) (0x0003 \| AE_CODE_ACPI_TABLES)	114	#define AE_BAD_CHECKSUM (acpi_status) (0x0003 \| AE_CODE_ACPI_TABLES)
121	#define AE_BAD_VALUE (acpi_status) (0x0004 \| AE_CODE_ACPI_TABLES)	115	#define AE_BAD_VALUE (acpi_status) (0x0004 \| AE_CODE_ACPI_TABLES)
122	#define AE_TABLE_NOT_SUPPORTED (acpi_status) (0x0005 \| AE_CODE_ACPI_TABLES)	116	#define AE_INVALID_TABLE_LENGTH (acpi_status) (0x0005 \| AE_CODE_ACPI_TABLES)
123	#define AE_INVALID_TABLE_LENGTH (acpi_status) (0x0006 \| AE_CODE_ACPI_TABLES)
124		117
125	#define AE_CODE_TBL_MAX 0x0006	118	#define AE_CODE_TBL_MAX 0x0005
126		119
127	/*	120	/*
128	* AML exceptions. These are caused by problems with	121	* AML exceptions. These are caused by problems with
129	* the actual AML byte stream	122	* the actual AML byte stream
130	*/	123	*/
131	#define AE_AML_ERROR (acpi_status) (0x0001 \| AE_CODE_AML)	124	#define AE_AML_BAD_OPCODE (acpi_status) (0x0001 \| AE_CODE_AML)
132	#define AE_AML_PARSE (acpi_status) (0x0002 \| AE_CODE_AML)	125	#define AE_AML_NO_OPERAND (acpi_status) (0x0002 \| AE_CODE_AML)
133	#define AE_AML_BAD_OPCODE (acpi_status) (0x0003 \| AE_CODE_AML)	126	#define AE_AML_OPERAND_TYPE (acpi_status) (0x0003 \| AE_CODE_AML)
134	#define AE_AML_NO_OPERAND (acpi_status) (0x0004 \| AE_CODE_AML)	127	#define AE_AML_OPERAND_VALUE (acpi_status) (0x0004 \| AE_CODE_AML)
135	#define AE_AML_OPERAND_TYPE (acpi_status) (0x0005 \| AE_CODE_AML)	128	#define AE_AML_UNINITIALIZED_LOCAL (acpi_status) (0x0005 \| AE_CODE_AML)
136	#define AE_AML_OPERAND_VALUE (acpi_status) (0x0006 \| AE_CODE_AML)	129	#define AE_AML_UNINITIALIZED_ARG (acpi_status) (0x0006 \| AE_CODE_AML)
137	#define AE_AML_UNINITIALIZED_LOCAL (acpi_status) (0x0007 \| AE_CODE_AML)	130	#define AE_AML_UNINITIALIZED_ELEMENT (acpi_status) (0x0007 \| AE_CODE_AML)
138	#define AE_AML_UNINITIALIZED_ARG (acpi_status) (0x0008 \| AE_CODE_AML)	131	#define AE_AML_NUMERIC_OVERFLOW (acpi_status) (0x0008 \| AE_CODE_AML)
139	#define AE_AML_UNINITIALIZED_ELEMENT (acpi_status) (0x0009 \| AE_CODE_AML)	132	#define AE_AML_REGION_LIMIT (acpi_status) (0x0009 \| AE_CODE_AML)
140	#define AE_AML_NUMERIC_OVERFLOW (acpi_status) (0x000A \| AE_CODE_AML)	133	#define AE_AML_BUFFER_LIMIT (acpi_status) (0x000A \| AE_CODE_AML)
141	#define AE_AML_REGION_LIMIT (acpi_status) (0x000B \| AE_CODE_AML)	134	#define AE_AML_PACKAGE_LIMIT (acpi_status) (0x000B \| AE_CODE_AML)
142	#define AE_AML_BUFFER_LIMIT (acpi_status) (0x000C \| AE_CODE_AML)	135	#define AE_AML_DIVIDE_BY_ZERO (acpi_status) (0x000C \| AE_CODE_AML)
143	#define AE_AML_PACKAGE_LIMIT (acpi_status) (0x000D \| AE_CODE_AML)	136	#define AE_AML_BAD_NAME (acpi_status) (0x000D \| AE_CODE_AML)
144	#define AE_AML_DIVIDE_BY_ZERO (acpi_status) (0x000E \| AE_CODE_AML)	137	#define AE_AML_NAME_NOT_FOUND (acpi_status) (0x000E \| AE_CODE_AML)
145	#define AE_AML_BAD_NAME (acpi_status) (0x000F \| AE_CODE_AML)	138	#define AE_AML_INTERNAL (acpi_status) (0x000F \| AE_CODE_AML)
146	#define AE_AML_NAME_NOT_FOUND (acpi_status) (0x0010 \| AE_CODE_AML)	139	#define AE_AML_INVALID_SPACE_ID (acpi_status) (0x0010 \| AE_CODE_AML)
147	#define AE_AML_INTERNAL (acpi_status) (0x0011 \| AE_CODE_AML)	140	#define AE_AML_STRING_LIMIT (acpi_status) (0x0011 \| AE_CODE_AML)
148	#define AE_AML_INVALID_SPACE_ID (acpi_status) (0x0012 \| AE_CODE_AML)	141	#define AE_AML_NO_RETURN_VALUE (acpi_status) (0x0012 \| AE_CODE_AML)
149	#define AE_AML_STRING_LIMIT (acpi_status) (0x0013 \| AE_CODE_AML)	142	#define AE_AML_METHOD_LIMIT (acpi_status) (0x0013 \| AE_CODE_AML)
150	#define AE_AML_NO_RETURN_VALUE (acpi_status) (0x0014 \| AE_CODE_AML)	143	#define AE_AML_NOT_OWNER (acpi_status) (0x0014 \| AE_CODE_AML)
151	#define AE_AML_METHOD_LIMIT (acpi_status) (0x0015 \| AE_CODE_AML)	144	#define AE_AML_MUTEX_ORDER (acpi_status) (0x0015 \| AE_CODE_AML)
152	#define AE_AML_NOT_OWNER (acpi_status) (0x0016 \| AE_CODE_AML)	145	#define AE_AML_MUTEX_NOT_ACQUIRED (acpi_status) (0x0016 \| AE_CODE_AML)
153	#define AE_AML_MUTEX_ORDER (acpi_status) (0x0017 \| AE_CODE_AML)	146	#define AE_AML_INVALID_RESOURCE_TYPE (acpi_status) (0x0017 \| AE_CODE_AML)
154	#define AE_AML_MUTEX_NOT_ACQUIRED (acpi_status) (0x0018 \| AE_CODE_AML)	147	#define AE_AML_INVALID_INDEX (acpi_status) (0x0018 \| AE_CODE_AML)
155	#define AE_AML_INVALID_RESOURCE_TYPE (acpi_status) (0x0019 \| AE_CODE_AML)	148	#define AE_AML_REGISTER_LIMIT (acpi_status) (0x0019 \| AE_CODE_AML)
156	#define AE_AML_INVALID_INDEX (acpi_status) (0x001A \| AE_CODE_AML)	149	#define AE_AML_NO_WHILE (acpi_status) (0x001A \| AE_CODE_AML)
157	#define AE_AML_REGISTER_LIMIT (acpi_status) (0x001B \| AE_CODE_AML)	150	#define AE_AML_ALIGNMENT (acpi_status) (0x001B \| AE_CODE_AML)
158	#define AE_AML_NO_WHILE (acpi_status) (0x001C \| AE_CODE_AML)	151	#define AE_AML_NO_RESOURCE_END_TAG (acpi_status) (0x001C \| AE_CODE_AML)
159	#define AE_AML_ALIGNMENT (acpi_status) (0x001D \| AE_CODE_AML)	152	#define AE_AML_BAD_RESOURCE_VALUE (acpi_status) (0x001D \| AE_CODE_AML)
160	#define AE_AML_NO_RESOURCE_END_TAG (acpi_status) (0x001E \| AE_CODE_AML)	153	#define AE_AML_CIRCULAR_REFERENCE (acpi_status) (0x001E \| AE_CODE_AML)
161	#define AE_AML_BAD_RESOURCE_VALUE (acpi_status) (0x001F \| AE_CODE_AML)	154	#define AE_AML_BAD_RESOURCE_LENGTH (acpi_status) (0x001F \| AE_CODE_AML)
162	#define AE_AML_CIRCULAR_REFERENCE (acpi_status) (0x0020 \| AE_CODE_AML)	155	#define AE_AML_ILLEGAL_ADDRESS (acpi_status) (0x0020 \| AE_CODE_AML)
163	#define AE_AML_BAD_RESOURCE_LENGTH (acpi_status) (0x0021 \| AE_CODE_AML)
164	#define AE_AML_ILLEGAL_ADDRESS (acpi_status) (0x0022 \| AE_CODE_AML)
165		156
166	#define AE_CODE_AML_MAX 0x0022	157	#define AE_CODE_AML_MAX 0x0020
167		158
168	/*	159	/*
169	* Internal exceptions used for control	160	* Internal exceptions used for control
@@ -206,19 +197,15 @@ char const *acpi_gbl_exception_names_env[] = {
206	"AE_STACK_OVERFLOW",	197	"AE_STACK_OVERFLOW",
207	"AE_STACK_UNDERFLOW",	198	"AE_STACK_UNDERFLOW",
208	"AE_NOT_IMPLEMENTED",	199	"AE_NOT_IMPLEMENTED",
209	"AE_VERSION_MISMATCH",
210	"AE_SUPPORT",	200	"AE_SUPPORT",
211	"AE_SHARE",
212	"AE_LIMIT",	201	"AE_LIMIT",
213	"AE_TIME",	202	"AE_TIME",
214	"AE_UNKNOWN_STATUS",
215	"AE_ACQUIRE_DEADLOCK",	203	"AE_ACQUIRE_DEADLOCK",
216	"AE_RELEASE_DEADLOCK",	204	"AE_RELEASE_DEADLOCK",
217	"AE_NOT_ACQUIRED",	205	"AE_NOT_ACQUIRED",
218	"AE_ALREADY_ACQUIRED",	206	"AE_ALREADY_ACQUIRED",
219	"AE_NO_HARDWARE_RESPONSE",	207	"AE_NO_HARDWARE_RESPONSE",
220	"AE_NO_GLOBAL_LOCK",	208	"AE_NO_GLOBAL_LOCK",
221	"AE_LOGICAL_ADDRESS",
222	"AE_ABORT_METHOD",	209	"AE_ABORT_METHOD",
223	"AE_SAME_HANDLER",	210	"AE_SAME_HANDLER",
224	"AE_WAKE_ONLY_GPE",	211	"AE_WAKE_ONLY_GPE",
@@ -231,8 +218,6 @@ char const *acpi_gbl_exception_names_pgm[] = {
231	"AE_BAD_CHARACTER",	218	"AE_BAD_CHARACTER",
232	"AE_BAD_PATHNAME",	219	"AE_BAD_PATHNAME",
233	"AE_BAD_DATA",	220	"AE_BAD_DATA",
234	"AE_BAD_ADDRESS",
235	"AE_ALIGNMENT",
236	"AE_BAD_HEX_CONSTANT",	221	"AE_BAD_HEX_CONSTANT",
237	"AE_BAD_OCTAL_CONSTANT",	222	"AE_BAD_OCTAL_CONSTANT",
238	"AE_BAD_DECIMAL_CONSTANT",	223	"AE_BAD_DECIMAL_CONSTANT",
@@ -245,14 +230,11 @@ char const *acpi_gbl_exception_names_tbl[] = {
245	"AE_BAD_HEADER",	230	"AE_BAD_HEADER",
246	"AE_BAD_CHECKSUM",	231	"AE_BAD_CHECKSUM",
247	"AE_BAD_VALUE",	232	"AE_BAD_VALUE",
248	"AE_TABLE_NOT_SUPPORTED",
249	"AE_INVALID_TABLE_LENGTH"	233	"AE_INVALID_TABLE_LENGTH"
250	};	234	};
251		235
252	char const *acpi_gbl_exception_names_aml[] = {	236	char const *acpi_gbl_exception_names_aml[] = {
253	NULL,	237	NULL,
254	"AE_AML_ERROR",
255	"AE_AML_PARSE",
256	"AE_AML_BAD_OPCODE",	238	"AE_AML_BAD_OPCODE",
257	"AE_AML_NO_OPERAND",	239	"AE_AML_NO_OPERAND",
258	"AE_AML_OPERAND_TYPE",	240	"AE_AML_OPERAND_TYPE",
@@ -284,7 +266,7 @@ char const *acpi_gbl_exception_names_aml[] = {
284	"AE_AML_BAD_RESOURCE_VALUE",	266	"AE_AML_BAD_RESOURCE_VALUE",
285	"AE_AML_CIRCULAR_REFERENCE",	267	"AE_AML_CIRCULAR_REFERENCE",
286	"AE_AML_BAD_RESOURCE_LENGTH",	268	"AE_AML_BAD_RESOURCE_LENGTH",
287	"AE_AML_ILLEGAL_ADDRESS"	269	"AE_AML_ILLEGAL_ADDRESS",
288	};	270	};
289		271
290	char const *acpi_gbl_exception_names_ctrl[] = {	272	char const *acpi_gbl_exception_names_ctrl[] = {