1 files changed, 14 insertions, 4 deletions

diff --git a/drivers/acpi/acpica/tbprint.c b/drivers/acpi/acpica/tbprint.c
index dc963f823d2c..6866e767ba90 100644
--- a/drivers/acpi/acpica/tbprint.c
+++ b/drivers/acpi/acpica/tbprint.c
@@ -135,10 +135,10 @@ acpi_tb_print_table_header(acpi_physical_address address,
 
                 /* FACS only has signature and length fields */
 
-                ACPI_INFO((AE_INFO, "%4.4s %p %05X",
+                ACPI_INFO((AE_INFO, "%4.4s %p %06X",
                            header->signature, ACPI_CAST_PTR(void, address),
                            header->length));
-        } else if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_RSDP)) {
+        } else if (ACPI_VALIDATE_RSDP_SIG(header->signature)) {
 
                 /* RSDP has no common fields */
 
@@ -147,7 +147,7 @@ acpi_tb_print_table_header(acpi_physical_address address,
                                           header)->oem_id, ACPI_OEM_ID_SIZE);
                 acpi_tb_fix_string(local_header.oem_id, ACPI_OEM_ID_SIZE);
 
-                ACPI_INFO((AE_INFO, "RSDP %p %05X (v%.2d %6.6s)",
+                ACPI_INFO((AE_INFO, "RSDP %p %06X (v%.2d %6.6s)",
                            ACPI_CAST_PTR(void, address),
                            (ACPI_CAST_PTR(struct acpi_table_rsdp, header)->
                             revision >
@@ -162,7 +162,7 @@ acpi_tb_print_table_header(acpi_physical_address address,
                 acpi_tb_cleanup_table_header(&local_header, header);
 
                 ACPI_INFO((AE_INFO,
-                           "%4.4s %p %05X (v%.2d %6.6s %8.8s %08X %4.4s %08X)",
+                           "%4.4s %p %06X (v%.2d %6.6s %8.8s %08X %4.4s %08X)",
                            local_header.signature, ACPI_CAST_PTR(void, address),
                            local_header.length, local_header.revision,
                            local_header.oem_id, local_header.oem_table_id,
@@ -190,6 +190,16 @@ acpi_status acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length)
 {
         u8 checksum;
 
+        /*
+         * FACS/S3PT:
+         * They are the odd tables, have no standard ACPI header and no checksum
+         */
+
+        if (ACPI_COMPARE_NAME(table->signature, ACPI_SIG_S3PT) ||
+            ACPI_COMPARE_NAME(table->signature, ACPI_SIG_FACS)) {
+                return (AE_OK);
+        }
+
         /* Compute the checksum on the table */
 
         checksum = acpi_tb_checksum(ACPI_CAST_PTR(u8, table), length);