summaryrefslogtreecommitdiffstats
path: root/include/acpi/ghes.h
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2014-06-03 16:32:53 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-06-16 22:33:50 +0200
commit0a00fd5e20fd5dc89e976e163588d7c54edaf745 (patch)
treee12e67e1d1386e7fde439865c4c29ed06ffc2510 /include/acpi/ghes.h
parent7171511eaec5bf23fb06078f59784a3a0626b38f (diff)
downloadlinux-0a00fd5e20fd5dc89e976e163588d7c54edaf745.tar.bz2
ACPICA: Restore error table definitions to reduce code differences between Linux and ACPICA upstream.
The following commit has changed ACPICA table header definitions: Commit: 88f074f4871a8c212b212b725e4dcdcdb09613c1 Subject: ACPI, CPER: Update cper info While such definitions are currently maintained in ACPICA. As the modifications applying to the table definitions affect other OSPMs' drivers, it is very difficult for ACPICA to initiate a process to complete the merge. Thus this commit finally only leaves us divergences. Revert such naming modifications to reduce the source code differecnes between Linux and ACPICA upstream. No functional changes. Signed-off-by: Lv Zheng <lv.zheng@intel.com> Cc: Bob Moore <robert.moore@intel.com> Cc: Chen, Gong <gong.chen@linux.intel.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Borislav Petkov <bp@alien8.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/acpi/ghes.h')
-rw-r--r--include/acpi/ghes.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/ghes.h b/include/acpi/ghes.h
index dfd60d0bfd27..720446cb243e 100644
--- a/include/acpi/ghes.h
+++ b/include/acpi/ghes.h
@@ -14,7 +14,7 @@
struct ghes {
struct acpi_hest_generic *generic;
- struct acpi_generic_status *estatus;
+ struct acpi_hest_generic_status *estatus;
u64 buffer_paddr;
unsigned long flags;
union {