diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/include/asm/mce.h | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 63abf3b19432..0a61946d4396 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h | |||
@@ -59,7 +59,7 @@ struct mce_log { | |||
59 | unsigned len; /* = MCE_LOG_LEN */ | 59 | unsigned len; /* = MCE_LOG_LEN */ |
60 | unsigned next; | 60 | unsigned next; |
61 | unsigned flags; | 61 | unsigned flags; |
62 | unsigned pad0; | 62 | unsigned recordlen; /* length of struct mce */ |
63 | struct mce entry[MCE_LOG_LEN]; | 63 | struct mce entry[MCE_LOG_LEN]; |
64 | }; | 64 | }; |
65 | 65 | ||
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 784f6ae9d6f4..3db047e7a0fb 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c | |||
@@ -108,8 +108,9 @@ EXPORT_PER_CPU_SYMBOL_GPL(injectm); | |||
108 | */ | 108 | */ |
109 | 109 | ||
110 | static struct mce_log mcelog = { | 110 | static struct mce_log mcelog = { |
111 | MCE_LOG_SIGNATURE, | 111 | .signature = MCE_LOG_SIGNATURE, |
112 | MCE_LOG_LEN, | 112 | .len = MCE_LOG_LEN, |
113 | .recordlen = sizeof(struct mce), | ||
113 | }; | 114 | }; |
114 | 115 | ||
115 | void mce_log(struct mce *mce) | 116 | void mce_log(struct mce *mce) |