summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-03-22 01:41:47 -0400
committerLen Brown <len.brown@intel.com>2011-03-22 01:41:47 -0400
commit25076246e80c0c48cc4c9115335b83343b9dc727 (patch)
treec7b462c6b4f67227722135a7a419ad110a6fd93e /include/acpi
parent05534c9ffc9d5d950b14de8ba49a7609dc59b0b8 (diff)
parentc413d7682020a127f54744a1b30f597692aea1fd (diff)
downloadlinux-25076246e80c0c48cc4c9115335b83343b9dc727.tar.bz2
Merge branch 'apei-release' into release
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/apei.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/acpi/apei.h b/include/acpi/apei.h
index c4dbb132d902..e67b523a50e1 100644
--- a/include/acpi/apei.h
+++ b/include/acpi/apei.h
@@ -30,10 +30,11 @@ int apei_hest_parse(apei_hest_func_t func, void *data);
int erst_write(const struct cper_record_header *record);
ssize_t erst_get_record_count(void);
-int erst_get_next_record_id(u64 *record_id);
+int erst_get_record_id_begin(int *pos);
+int erst_get_record_id_next(int *pos, u64 *record_id);
+void erst_get_record_id_end(void);
ssize_t erst_read(u64 record_id, struct cper_record_header *record,
size_t buflen);
-ssize_t erst_read_next(struct cper_record_header *record, size_t buflen);
int erst_clear(u64 record_id);
#endif