diff options
Diffstat (limited to 'drivers/acpi/tables/tbrsdt.c')
-rw-r--r-- | drivers/acpi/tables/tbrsdt.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/acpi/tables/tbrsdt.c b/drivers/acpi/tables/tbrsdt.c index ad0252c2f7db..178309026850 100644 --- a/drivers/acpi/tables/tbrsdt.c +++ b/drivers/acpi/tables/tbrsdt.c | |||
@@ -5,7 +5,7 @@ | |||
5 | *****************************************************************************/ | 5 | *****************************************************************************/ |
6 | 6 | ||
7 | /* | 7 | /* |
8 | * Copyright (C) 2000 - 2005, R. Byron Moore | 8 | * Copyright (C) 2000 - 2006, R. Byron Moore |
9 | * All rights reserved. | 9 | * All rights reserved. |
10 | * | 10 | * |
11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without |
@@ -176,7 +176,7 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr) | |||
176 | { | 176 | { |
177 | int no_match; | 177 | int no_match; |
178 | 178 | ||
179 | ACPI_FUNCTION_NAME("tb_validate_rsdt"); | 179 | ACPI_FUNCTION_ENTRY(); |
180 | 180 | ||
181 | /* | 181 | /* |
182 | * Search for appropriate signature, RSDT or XSDT | 182 | * Search for appropriate signature, RSDT or XSDT |
@@ -192,15 +192,11 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr) | |||
192 | if (no_match) { | 192 | if (no_match) { |
193 | /* Invalid RSDT or XSDT signature */ | 193 | /* Invalid RSDT or XSDT signature */ |
194 | 194 | ||
195 | ACPI_REPORT_ERROR(("Invalid signature where RSDP indicates RSDT/XSDT should be located\n")); | 195 | ACPI_REPORT_ERROR(("Invalid signature where RSDP indicates RSDT/XSDT should be located. RSDP:\n")); |
196 | 196 | ||
197 | ACPI_DUMP_BUFFER(acpi_gbl_RSDP, 20); | 197 | ACPI_DUMP_BUFFER(acpi_gbl_RSDP, 20); |
198 | 198 | ||
199 | ACPI_DEBUG_PRINT_RAW((ACPI_DB_ERROR, | 199 | ACPI_REPORT_ERROR(("RSDT/XSDT signature at %X (%p) is invalid\n", acpi_gbl_RSDP->rsdt_physical_address, (void *)(acpi_native_uint) acpi_gbl_RSDP->rsdt_physical_address)); |
200 | "RSDT/XSDT signature at %X (%p) is invalid\n", | ||
201 | acpi_gbl_RSDP->rsdt_physical_address, | ||
202 | (void *)(acpi_native_uint) acpi_gbl_RSDP-> | ||
203 | rsdt_physical_address)); | ||
204 | 200 | ||
205 | if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) { | 201 | if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) { |
206 | ACPI_REPORT_ERROR(("Looking for RSDT\n")) | 202 | ACPI_REPORT_ERROR(("Looking for RSDT\n")) |
@@ -209,7 +205,6 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr) | |||
209 | } | 205 | } |
210 | 206 | ||
211 | ACPI_DUMP_BUFFER((char *)table_ptr, 48); | 207 | ACPI_DUMP_BUFFER((char *)table_ptr, 48); |
212 | |||
213 | return (AE_BAD_SIGNATURE); | 208 | return (AE_BAD_SIGNATURE); |
214 | } | 209 | } |
215 | 210 | ||
@@ -243,15 +238,14 @@ acpi_status acpi_tb_get_table_rsdt(void) | |||
243 | table_info.type = ACPI_TABLE_XSDT; | 238 | table_info.type = ACPI_TABLE_XSDT; |
244 | status = acpi_tb_get_table(&address, &table_info); | 239 | status = acpi_tb_get_table(&address, &table_info); |
245 | if (ACPI_FAILURE(status)) { | 240 | if (ACPI_FAILURE(status)) { |
246 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 241 | ACPI_REPORT_ERROR(("Could not get the RSDT/XSDT, %s\n", |
247 | "Could not get the RSDT/XSDT, %s\n", | 242 | acpi_format_exception(status))); |
248 | acpi_format_exception(status))); | ||
249 | 243 | ||
250 | return_ACPI_STATUS(status); | 244 | return_ACPI_STATUS(status); |
251 | } | 245 | } |
252 | 246 | ||
253 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 247 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
254 | "RSDP located at %p, points to RSDT physical=%8.8X%8.8X \n", | 248 | "RSDP located at %p, points to RSDT physical=%8.8X%8.8X\n", |
255 | acpi_gbl_RSDP, | 249 | acpi_gbl_RSDP, |
256 | ACPI_FORMAT_UINT64(address.pointer.value))); | 250 | ACPI_FORMAT_UINT64(address.pointer.value))); |
257 | 251 | ||