aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2012-10-30 22:28:27 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-14 18:31:30 -0500
commit17b1f45a68ebd7944904a801d81a5c4206f9f76b (patch)
treefb5161196f86988058057a9c5e52f2704ef5ab79 /drivers/acpi
parent47abd13ccfa140ad34620b343bf0e6eca15ed8e8 (diff)
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')
-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)
139 ACPI_ERROR((AE_INFO, 139 ACPI_ERROR((AE_INFO,
140 "Unknown opcode 0x%.2X at table offset 0x%.4X, ignoring", 140 "Unknown opcode 0x%.2X at table offset 0x%.4X, ignoring",
141 walk_state->opcode, 141 walk_state->opcode,
142 walk_state->aml_offset + 142 (u32)(walk_state->aml_offset +
143 sizeof(struct acpi_table_header))); 143 sizeof(struct acpi_table_header))));
144 144
145 ACPI_DUMP_BUFFER(walk_state->parser_state.aml - 16, 48); 145 ACPI_DUMP_BUFFER(walk_state->parser_state.aml - 16, 48);
146 146
@@ -152,8 +152,8 @@ static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state)
152 acpi_os_printf 152 acpi_os_printf
153 ("/*\nError: Unknown opcode 0x%.2X at table offset 0x%.4X, context:\n", 153 ("/*\nError: Unknown opcode 0x%.2X at table offset 0x%.4X, context:\n",
154 walk_state->opcode, 154 walk_state->opcode,
155 walk_state->aml_offset + 155 (u32)(walk_state->aml_offset +
156 sizeof(struct acpi_table_header)); 156 sizeof(struct acpi_table_header)));
157 157
158 /* Dump the context surrounding the invalid opcode */ 158 /* Dump the context surrounding the invalid opcode */
159 159