aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/tables/tbconvrt.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/tables/tbconvrt.c')
-rw-r--r--drivers/acpi/tables/tbconvrt.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/tables/tbconvrt.c b/drivers/acpi/tables/tbconvrt.c
index 03b37d2223bc..254ebdbb7bef 100644
--- a/drivers/acpi/tables/tbconvrt.c
+++ b/drivers/acpi/tables/tbconvrt.c
@@ -147,6 +147,7 @@ acpi_status acpi_tb_convert_to_xsdt(struct acpi_table_desc *table_info)
147 /* Copy the table pointers */ 147 /* Copy the table pointers */
148 148
149 for (i = 0; i < acpi_gbl_rsdt_table_count; i++) { 149 for (i = 0; i < acpi_gbl_rsdt_table_count; i++) {
150
150 /* RSDT pointers are 32 bits, XSDT pointers are 64 bits */ 151 /* RSDT pointers are 32 bits, XSDT pointers are 64 bits */
151 152
152 if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) { 153 if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
@@ -515,6 +516,7 @@ acpi_status acpi_tb_convert_table_fadt(void)
515 516
516 if (acpi_gbl_FADT->revision >= FADT2_REVISION_ID) { 517 if (acpi_gbl_FADT->revision >= FADT2_REVISION_ID) {
517 if (acpi_gbl_FADT->length < sizeof(struct fadt_descriptor_rev2)) { 518 if (acpi_gbl_FADT->length < sizeof(struct fadt_descriptor_rev2)) {
519
518 /* Length is too short to be a V2.0 table */ 520 /* Length is too short to be a V2.0 table */
519 521
520 ACPI_WARNING((AE_INFO, 522 ACPI_WARNING((AE_INFO,
@@ -603,6 +605,7 @@ acpi_status acpi_tb_build_common_facs(struct acpi_table_desc *table_info)
603 if ((acpi_gbl_RSDP->revision < 2) || 605 if ((acpi_gbl_RSDP->revision < 2) ||
604 (acpi_gbl_FACS->length < 32) || 606 (acpi_gbl_FACS->length < 32) ||
605 (!(acpi_gbl_FACS->xfirmware_waking_vector))) { 607 (!(acpi_gbl_FACS->xfirmware_waking_vector))) {
608
606 /* ACPI 1.0 FACS or short table or optional X_ field is zero */ 609 /* ACPI 1.0 FACS or short table or optional X_ field is zero */
607 610
608 acpi_gbl_common_fACS.firmware_waking_vector = ACPI_CAST_PTR(u64, 611 acpi_gbl_common_fACS.firmware_waking_vector = ACPI_CAST_PTR(u64,