diff options
author | Dave Airlie <airlied@redhat.com> | 2015-08-17 14:13:53 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-08-17 14:13:53 +1000 |
commit | 4eebf60b7452fbd551fd7dece855ba7825a49cbc (patch) | |
tree | 490b4d194ba09c90e10201ab7fc084a0bda0ed27 /include/linux/cper.h | |
parent | 8f9cb50789e76f3e224e8861adf650e55c747af4 (diff) | |
parent | 2c6625cd545bdd66acff14f3394865d43920a5c7 (diff) | |
download | linux-stable-4eebf60b7452fbd551fd7dece855ba7825a49cbc.tar.gz linux-stable-4eebf60b7452fbd551fd7dece855ba7825a49cbc.tar.bz2 linux-stable-4eebf60b7452fbd551fd7dece855ba7825a49cbc.zip |
Merge tag 'v4.2-rc7' into drm-next
Linux 4.2-rc7
Backmerge master for i915 fixes
Diffstat (limited to 'include/linux/cper.h')
-rw-r--r-- | include/linux/cper.h | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/include/linux/cper.h b/include/linux/cper.h index 76abba4b238e..dcacb1a72e26 100644 --- a/include/linux/cper.h +++ b/include/linux/cper.h @@ -340,7 +340,27 @@ struct cper_ia_proc_ctx { __u64 mm_reg_addr; }; -/* Memory Error Section */ +/* Old Memory Error Section UEFI 2.1, 2.2 */ +struct cper_sec_mem_err_old { + __u64 validation_bits; + __u64 error_status; + __u64 physical_addr; + __u64 physical_addr_mask; + __u16 node; + __u16 card; + __u16 module; + __u16 bank; + __u16 device; + __u16 row; + __u16 column; + __u16 bit_pos; + __u64 requestor_id; + __u64 responder_id; + __u64 target_id; + __u8 error_type; +}; + +/* Memory Error Section UEFI >= 2.3 */ struct cper_sec_mem_err { __u64 validation_bits; __u64 error_status; |