diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 03:06:26 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 03:06:26 -0400 |
commit | b73077eb03f510a84b102fb97640e595a958403c (patch) | |
tree | 8b639000418e2756bf6baece4e00e07d2534bccc /include/linux/cper.h | |
parent | 28350e330cfab46b60a1dbf763b678d859f9f3d9 (diff) | |
parent | 9d2e173644bb5c42ff1b280fbdda3f195a7cf1f7 (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/cper.h')
-rw-r--r-- | include/linux/cper.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/cper.h b/include/linux/cper.h index 3104aaff5dd0..c23049496531 100644 --- a/include/linux/cper.h +++ b/include/linux/cper.h | |||
@@ -310,7 +310,7 @@ struct cper_sec_proc_ia { | |||
310 | __u8 cpuid[48]; | 310 | __u8 cpuid[48]; |
311 | }; | 311 | }; |
312 | 312 | ||
313 | /* IA32/X64 Processor Error Infomation Structure */ | 313 | /* IA32/X64 Processor Error Information Structure */ |
314 | struct cper_ia_err_info { | 314 | struct cper_ia_err_info { |
315 | uuid_le err_type; | 315 | uuid_le err_type; |
316 | __u64 validation_bits; | 316 | __u64 validation_bits; |
@@ -388,5 +388,7 @@ struct cper_sec_pcie { | |||
388 | #pragma pack() | 388 | #pragma pack() |
389 | 389 | ||
390 | u64 cper_next_record_id(void); | 390 | u64 cper_next_record_id(void); |
391 | void cper_print_bits(const char *prefix, unsigned int bits, | ||
392 | const char *strs[], unsigned int strs_size); | ||
391 | 393 | ||
392 | #endif | 394 | #endif |