diff options
-rw-r--r-- | drivers/acpi/executer/exdump.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c index 2450943add33..c9cab1691d04 100644 --- a/drivers/acpi/executer/exdump.c +++ b/drivers/acpi/executer/exdump.c | |||
@@ -59,8 +59,6 @@ static void acpi_ex_out_string(char *title, char *value); | |||
59 | 59 | ||
60 | static void acpi_ex_out_pointer(char *title, void *value); | 60 | static void acpi_ex_out_pointer(char *title, void *value); |
61 | 61 | ||
62 | static void acpi_ex_out_address(char *title, acpi_physical_address value); | ||
63 | |||
64 | static void | 62 | static void |
65 | acpi_ex_dump_object(union acpi_operand_object *obj_desc, | 63 | acpi_ex_dump_object(union acpi_operand_object *obj_desc, |
66 | struct acpi_exdump_info *info); | 64 | struct acpi_exdump_info *info); |
@@ -92,10 +90,11 @@ static struct acpi_exdump_info acpi_ex_dump_string[4] = { | |||
92 | {ACPI_EXD_STRING, 0, NULL} | 90 | {ACPI_EXD_STRING, 0, NULL} |
93 | }; | 91 | }; |
94 | 92 | ||
95 | static struct acpi_exdump_info acpi_ex_dump_buffer[4] = { | 93 | static struct acpi_exdump_info acpi_ex_dump_buffer[5] = { |
96 | {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_buffer), NULL}, | 94 | {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_buffer), NULL}, |
97 | {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(buffer.length), "Length"}, | 95 | {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(buffer.length), "Length"}, |
98 | {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(buffer.pointer), "Pointer"}, | 96 | {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(buffer.pointer), "Pointer"}, |
97 | {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(buffer.node), "Parent Node"}, | ||
99 | {ACPI_EXD_BUFFER, 0, NULL} | 98 | {ACPI_EXD_BUFFER, 0, NULL} |
100 | }; | 99 | }; |
101 | 100 | ||
@@ -165,8 +164,8 @@ static struct acpi_exdump_info acpi_ex_dump_power[5] = { | |||
165 | 164 | ||
166 | static struct acpi_exdump_info acpi_ex_dump_processor[7] = { | 165 | static struct acpi_exdump_info acpi_ex_dump_processor[7] = { |
167 | {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_processor), NULL}, | 166 | {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_processor), NULL}, |
168 | {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(processor.proc_id), "Processor ID"}, | 167 | {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(processor.proc_id), "Processor ID"}, |
169 | {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(processor.length), "Length"}, | 168 | {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(processor.length), "Length"}, |
170 | {ACPI_EXD_ADDRESS, ACPI_EXD_OFFSET(processor.address), "Address"}, | 169 | {ACPI_EXD_ADDRESS, ACPI_EXD_OFFSET(processor.address), "Address"}, |
171 | {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.system_notify), | 170 | {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.system_notify), |
172 | "System Notify"}, | 171 | "System Notify"}, |
@@ -379,18 +378,12 @@ acpi_ex_dump_object(union acpi_operand_object *obj_desc, | |||
379 | break; | 378 | break; |
380 | 379 | ||
381 | case ACPI_EXD_POINTER: | 380 | case ACPI_EXD_POINTER: |
381 | case ACPI_EXD_ADDRESS: | ||
382 | 382 | ||
383 | acpi_ex_out_pointer(name, | 383 | acpi_ex_out_pointer(name, |
384 | *ACPI_CAST_PTR(void *, target)); | 384 | *ACPI_CAST_PTR(void *, target)); |
385 | break; | 385 | break; |
386 | 386 | ||
387 | case ACPI_EXD_ADDRESS: | ||
388 | |||
389 | acpi_ex_out_address(name, | ||
390 | *ACPI_CAST_PTR | ||
391 | (acpi_physical_address, target)); | ||
392 | break; | ||
393 | |||
394 | case ACPI_EXD_STRING: | 387 | case ACPI_EXD_STRING: |
395 | 388 | ||
396 | acpi_ut_print_string(obj_desc->string.pointer, | 389 | acpi_ut_print_string(obj_desc->string.pointer, |
@@ -834,16 +827,6 @@ static void acpi_ex_out_pointer(char *title, void *value) | |||
834 | acpi_os_printf("%20s : %p\n", title, value); | 827 | acpi_os_printf("%20s : %p\n", title, value); |
835 | } | 828 | } |
836 | 829 | ||
837 | static void acpi_ex_out_address(char *title, acpi_physical_address value) | ||
838 | { | ||
839 | |||
840 | #if ACPI_MACHINE_WIDTH == 16 | ||
841 | acpi_os_printf("%20s : %p\n", title, value); | ||
842 | #else | ||
843 | acpi_os_printf("%20s : %8.8X%8.8X\n", title, ACPI_FORMAT_UINT64(value)); | ||
844 | #endif | ||
845 | } | ||
846 | |||
847 | /******************************************************************************* | 830 | /******************************************************************************* |
848 | * | 831 | * |
849 | * FUNCTION: acpi_ex_dump_namespace_node | 832 | * FUNCTION: acpi_ex_dump_namespace_node |