diff options
Diffstat (limited to 'drivers/acpi/utilities/utxface.c')
-rw-r--r-- | drivers/acpi/utilities/utxface.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c index 3538f69c82a1..7ea2981d4382 100644 --- a/drivers/acpi/utilities/utxface.c +++ b/drivers/acpi/utilities/utxface.c | |||
@@ -398,7 +398,6 @@ acpi_status acpi_get_system_info(struct acpi_buffer * out_buffer) | |||
398 | { | 398 | { |
399 | struct acpi_system_info *info_ptr; | 399 | struct acpi_system_info *info_ptr; |
400 | acpi_status status; | 400 | acpi_status status; |
401 | u32 i; | ||
402 | 401 | ||
403 | ACPI_FUNCTION_TRACE(acpi_get_system_info); | 402 | ACPI_FUNCTION_TRACE(acpi_get_system_info); |
404 | 403 | ||
@@ -431,9 +430,7 @@ acpi_status acpi_get_system_info(struct acpi_buffer * out_buffer) | |||
431 | 430 | ||
432 | /* Timer resolution - 24 or 32 bits */ | 431 | /* Timer resolution - 24 or 32 bits */ |
433 | 432 | ||
434 | if (!acpi_gbl_FADT) { | 433 | if (acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER) { |
435 | info_ptr->timer_resolution = 0; | ||
436 | } else if (acpi_gbl_FADT->tmr_val_ext == 0) { | ||
437 | info_ptr->timer_resolution = 24; | 434 | info_ptr->timer_resolution = 24; |
438 | } else { | 435 | } else { |
439 | info_ptr->timer_resolution = 32; | 436 | info_ptr->timer_resolution = 32; |
@@ -449,13 +446,6 @@ acpi_status acpi_get_system_info(struct acpi_buffer * out_buffer) | |||
449 | info_ptr->debug_layer = acpi_dbg_layer; | 446 | info_ptr->debug_layer = acpi_dbg_layer; |
450 | info_ptr->debug_level = acpi_dbg_level; | 447 | info_ptr->debug_level = acpi_dbg_level; |
451 | 448 | ||
452 | /* Current status of the ACPI tables, per table type */ | ||
453 | |||
454 | info_ptr->num_table_types = ACPI_TABLE_ID_MAX + 1; | ||
455 | for (i = 0; i < (ACPI_TABLE_ID_MAX + 1); i++) { | ||
456 | info_ptr->table_info[i].count = acpi_gbl_table_lists[i].count; | ||
457 | } | ||
458 | |||
459 | return_ACPI_STATUS(AE_OK); | 449 | return_ACPI_STATUS(AE_OK); |
460 | } | 450 | } |
461 | 451 | ||