Message ID | 1355744792-691-1-git-send-email-colin.king@canonical.com |
---|---|
State | Accepted |
Headers | show |
On Mon, Dec 17, 2012 at 7:46 PM, Colin King <colin.king@canonical.com> wrote: > From: Colin Ian King <colin.king@canonical.com> > > The most generic parse/execution failure message should be handled last so > that the more specific matches get matched first. Move it down the list. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > data/klog.json | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/data/klog.json b/data/klog.json > index 00c44e7..665774b 100644 > --- a/data/klog.json > +++ b/data/klog.json > @@ -2739,14 +2739,6 @@ > "label": "KlogAcpiTimeout" > }, > { > - "compare_mode": "string", > - "log_level": "LOG_LEVEL_HIGH", > - "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL", > - "pattern": "Method parse/execution failed", > - "advice": "The ACPI driver encounted a parse or execution error on some ACPI AML code. This is unexepcted and normally indicates that there is a bug in the compiled AML code. It could be a programming fault or an AML compiler issue. See acpi_ps_parse_aml().", > - "label": "KlogAcpiParseExecAmlFailed" > - }, > - { > "compare_mode": "regex", > "log_level": "LOG_LEVEL_HIGH", > "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL", > @@ -2835,6 +2827,14 @@ > "label": "KlogAcpiMutexNotAcquired" > }, > { > + "compare_mode": "string", > + "log_level": "LOG_LEVEL_HIGH", > + "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL", > + "pattern": "Method parse/execution failed", > + "advice": "The ACPI driver encounted a parse or execution error on some ACPI AML code. This is unexepcted and normally indicates that there is a bug in the compiled AML code. It could be a programming fault or an AML compiler issue. See acpi_ps_parse_aml().", > + "label": "KlogAcpiParseExecAmlFailed" > + }, > + { > "compare_mode": "regex", > "log_level": "LOG_LEVEL_HIGH", > "tag": "FWTS_TAG_ACPI", > -- > 1.8.0 > Acked-by: Keng-Yu Lin <kengyu@canonical.com>
On 12/17/2012 07:46 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > The most generic parse/execution failure message should be handled last so > that the more specific matches get matched first. Move it down the list. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > data/klog.json | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/data/klog.json b/data/klog.json > index 00c44e7..665774b 100644 > --- a/data/klog.json > +++ b/data/klog.json > @@ -2739,14 +2739,6 @@ > "label": "KlogAcpiTimeout" > }, > { > - "compare_mode": "string", > - "log_level": "LOG_LEVEL_HIGH", > - "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL", > - "pattern": "Method parse/execution failed", > - "advice": "The ACPI driver encounted a parse or execution error on some ACPI AML code. This is unexepcted and normally indicates that there is a bug in the compiled AML code. It could be a programming fault or an AML compiler issue. See acpi_ps_parse_aml().", > - "label": "KlogAcpiParseExecAmlFailed" > - }, > - { > "compare_mode": "regex", > "log_level": "LOG_LEVEL_HIGH", > "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL", > @@ -2835,6 +2827,14 @@ > "label": "KlogAcpiMutexNotAcquired" > }, > { > + "compare_mode": "string", > + "log_level": "LOG_LEVEL_HIGH", > + "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL", > + "pattern": "Method parse/execution failed", > + "advice": "The ACPI driver encounted a parse or execution error on some ACPI AML code. This is unexepcted and normally indicates that there is a bug in the compiled AML code. It could be a programming fault or an AML compiler issue. See acpi_ps_parse_aml().", > + "label": "KlogAcpiParseExecAmlFailed" > + }, > + { > "compare_mode": "regex", > "log_level": "LOG_LEVEL_HIGH", > "tag": "FWTS_TAG_ACPI", > Acked-by: Alex Hung <alex.hung@canonical.com>
diff --git a/data/klog.json b/data/klog.json index 00c44e7..665774b 100644 --- a/data/klog.json +++ b/data/klog.json @@ -2739,14 +2739,6 @@ "label": "KlogAcpiTimeout" }, { - "compare_mode": "string", - "log_level": "LOG_LEVEL_HIGH", - "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL", - "pattern": "Method parse/execution failed", - "advice": "The ACPI driver encounted a parse or execution error on some ACPI AML code. This is unexepcted and normally indicates that there is a bug in the compiled AML code. It could be a programming fault or an AML compiler issue. See acpi_ps_parse_aml().", - "label": "KlogAcpiParseExecAmlFailed" - }, - { "compare_mode": "regex", "log_level": "LOG_LEVEL_HIGH", "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL", @@ -2835,6 +2827,14 @@ "label": "KlogAcpiMutexNotAcquired" }, { + "compare_mode": "string", + "log_level": "LOG_LEVEL_HIGH", + "tag": "FWTS_TAG_ACPI_PARSE_EXEC_FAIL", + "pattern": "Method parse/execution failed", + "advice": "The ACPI driver encounted a parse or execution error on some ACPI AML code. This is unexepcted and normally indicates that there is a bug in the compiled AML code. It could be a programming fault or an AML compiler issue. See acpi_ps_parse_aml().", + "label": "KlogAcpiParseExecAmlFailed" + }, + { "compare_mode": "regex", "log_level": "LOG_LEVEL_HIGH", "tag": "FWTS_TAG_ACPI",