summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2012-10-31 02:28:27 +0000
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-15 00:31:30 +0100
commit17b1f45a68ebd7944904a801d81a5c4206f9f76b (patch)
treefb5161196f86988058057a9c5e52f2704ef5ab79 /drivers/acpi/acpica
parent47abd13ccfa140ad34620b343bf0e6eca15ed8e8 (diff)
downloadlinux-17b1f45a68ebd7944904a801d81a5c4206f9f76b.tar.bz2
ACPICA: Update for 64-bit generation of recent error message changes
Fix for errors on printf changes on 64-bit platforms and gcc. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica')
-rw-r--r--drivers/acpi/acpica/psloop.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index d48c8fc0e729..5607805aab26 100644
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -139,8 +139,8 @@ static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state)
ACPI_ERROR((AE_INFO,
"Unknown opcode 0x%.2X at table offset 0x%.4X, ignoring",
walk_state->opcode,
- walk_state->aml_offset +
- sizeof(struct acpi_table_header)));
+ (u32)(walk_state->aml_offset +
+ sizeof(struct acpi_table_header))));
ACPI_DUMP_BUFFER(walk_state->parser_state.aml - 16, 48);
@@ -152,8 +152,8 @@ static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state)
acpi_os_printf
("/*\nError: Unknown opcode 0x%.2X at table offset 0x%.4X, context:\n",
walk_state->opcode,
- walk_state->aml_offset +
- sizeof(struct acpi_table_header));
+ (u32)(walk_state->aml_offset +
+ sizeof(struct acpi_table_header)));
/* Dump the context surrounding the invalid opcode */