summaryrefslogtreecommitdiff
path: root/drivers/acpi/acpica/acstruct.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-01 04:37:30 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-01 04:37:30 +0300
commitc91c5b276bc1e60c0d65ff69e29b6edc5948430d (patch)
tree5c6d647777cba479c34f5eda0eb5150fed747be3 /drivers/acpi/acpica/acstruct.h
parent64291f7db5bd8150a74ad2036f1037e6a0428df2 (diff)
parentb7a4f7ff7f83bd42ee765f666e6c0a28545bc6d6 (diff)
downloadlinux-c91c5b276bc1e60c0d65ff69e29b6edc5948430d.tar.xz
Merge branch 'acpica'
* acpica: (42 commits) ACPICA: Update version to 20150818 ACPICA: Debugger: Cleanup debugging outputs to dump name path without trailing underscores ACPICA: Disassembler: Cleanup acpi_gbl_db_opt_verbose acpiexec usage ACPICA: Disassembler: Cleanup acpi_gbl_db_opt_disasm ACPICA: Debugger: Split debugger initialization/termination APIs ACPICA: Header support to improve compatibility with MSVC ACPICA: Make the max-number-of-loops runtime configurable ACPICA: Debugger: Add option to display namespace summary/counts ACPICA: Add additional debug info/statements ACPICA: Table handling: Cleanup and update debug output for tools ACPICA: acpiexec/acpinames: Support very large number of ACPI tables ACPICA: acpinames: Add new options and wildcard support ACPICA: Headers: Fix some comments, no functional change ACPICA: Tables: Cleanup to reduce FACS globals ACPICA: Tables: Fix global table list issues by removing fixed table indexes ACPICA: Update info messages during ACPICA init ACPICA: Disassembler: Update for new listing mode ACPICA: Update parameter validation for data_table_region and load_table ACPICA: Disassembler: Remove duplicate code in _PLD processing. ACPICA: Correctly cleanup after a ACPI table load failure ...
Diffstat (limited to 'drivers/acpi/acpica/acstruct.h')
-rw-r--r--drivers/acpi/acpica/acstruct.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index 44997ca02ae2..f9992dced1f9 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -85,7 +85,7 @@ struct acpi_walk_state {
u8 namespace_override; /* Override existing objects */
u8 result_size; /* Total elements for the result stack */
u8 result_count; /* Current number of occupied elements of result stack */
- u32 aml_offset;
+ u8 *aml;
u32 arg_types;
u32 method_breakpoint; /* For single stepping */
u32 user_breakpoint; /* User AML breakpoint */