diff options
Diffstat (limited to 'drivers/acpi/tables/tbconvrt.c')
-rw-r--r-- | drivers/acpi/tables/tbconvrt.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/acpi/tables/tbconvrt.c b/drivers/acpi/tables/tbconvrt.c index 48290b7e6ba5..03b37d2223bc 100644 --- a/drivers/acpi/tables/tbconvrt.c +++ b/drivers/acpi/tables/tbconvrt.c | |||
@@ -501,8 +501,8 @@ acpi_status acpi_tb_convert_table_fadt(void) | |||
501 | * at least as long as the version 1.0 FADT | 501 | * at least as long as the version 1.0 FADT |
502 | */ | 502 | */ |
503 | if (acpi_gbl_FADT->length < sizeof(struct fadt_descriptor_rev1)) { | 503 | if (acpi_gbl_FADT->length < sizeof(struct fadt_descriptor_rev1)) { |
504 | ACPI_REPORT_ERROR(("FADT is invalid, too short: 0x%X\n", | 504 | ACPI_ERROR((AE_INFO, "FADT is invalid, too short: 0x%X", |
505 | acpi_gbl_FADT->length)); | 505 | acpi_gbl_FADT->length)); |
506 | return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH); | 506 | return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH); |
507 | } | 507 | } |
508 | 508 | ||
@@ -517,7 +517,10 @@ acpi_status acpi_tb_convert_table_fadt(void) | |||
517 | if (acpi_gbl_FADT->length < sizeof(struct fadt_descriptor_rev2)) { | 517 | if (acpi_gbl_FADT->length < sizeof(struct fadt_descriptor_rev2)) { |
518 | /* Length is too short to be a V2.0 table */ | 518 | /* Length is too short to be a V2.0 table */ |
519 | 519 | ||
520 | ACPI_REPORT_WARNING(("Inconsistent FADT length (0x%X) and revision (0x%X), using FADT V1.0 portion of table\n", acpi_gbl_FADT->length, acpi_gbl_FADT->revision)); | 520 | ACPI_WARNING((AE_INFO, |
521 | "Inconsistent FADT length (0x%X) and revision (0x%X), using FADT V1.0 portion of table", | ||
522 | acpi_gbl_FADT->length, | ||
523 | acpi_gbl_FADT->revision)); | ||
521 | 524 | ||
522 | acpi_tb_convert_fadt1(local_fadt, | 525 | acpi_tb_convert_fadt1(local_fadt, |
523 | (void *)acpi_gbl_FADT); | 526 | (void *)acpi_gbl_FADT); |
@@ -582,13 +585,15 @@ acpi_status acpi_tb_build_common_facs(struct acpi_table_desc *table_info) | |||
582 | /* Absolute minimum length is 24, but the ACPI spec says 64 */ | 585 | /* Absolute minimum length is 24, but the ACPI spec says 64 */ |
583 | 586 | ||
584 | if (acpi_gbl_FACS->length < 24) { | 587 | if (acpi_gbl_FACS->length < 24) { |
585 | ACPI_REPORT_ERROR(("Invalid FACS table length: 0x%X\n", | 588 | ACPI_ERROR((AE_INFO, "Invalid FACS table length: 0x%X", |
586 | acpi_gbl_FACS->length)); | 589 | acpi_gbl_FACS->length)); |
587 | return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH); | 590 | return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH); |
588 | } | 591 | } |
589 | 592 | ||
590 | if (acpi_gbl_FACS->length < 64) { | 593 | if (acpi_gbl_FACS->length < 64) { |
591 | ACPI_REPORT_WARNING(("FACS is shorter than the ACPI specification allows: 0x%X, using anyway\n", acpi_gbl_FACS->length)); | 594 | ACPI_WARNING((AE_INFO, |
595 | "FACS is shorter than the ACPI specification allows: 0x%X, using anyway", | ||
596 | acpi_gbl_FACS->length)); | ||
592 | } | 597 | } |
593 | 598 | ||
594 | /* Copy fields to the new FACS */ | 599 | /* Copy fields to the new FACS */ |