The following commit has been merged into the ras/core branch of tip: Commit-ID: f82cdff1aa7f6dcf6625c7219342a6e5c977098d Gitweb: https://git.kernel.org/tip/f82cdff1aa7f6dcf6625c7219342a6e5c977098d Author: Tony Luck <tony.luck@xxxxxxxxx> AuthorDate: Wed, 15 Apr 2020 12:58:26 -07:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Fri, 17 Apr 2020 11:12:21 +02:00 x86/mce: Drop bogus comment about mce.kflags The bit definitions for kflags are for internal use only. A late edit moved them from uapi/asm/mce.h to the internal x86 <asm/mce.h>, but the comment saying "See below" was accidentally left here. Delete "See below". Just labelling this field as internal kernel use is sufficient. Fixes: 1de08dccd383 ("x86/mce: Add a struct mce.kflags field") Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Link: https://lkml.kernel.org/r/20200415195826.GA13681@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx --- arch/x86/include/uapi/asm/mce.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/mce.h b/arch/x86/include/uapi/asm/mce.h index 5b59d80..db9adc0 100644 --- a/arch/x86/include/uapi/asm/mce.h +++ b/arch/x86/include/uapi/asm/mce.h @@ -35,7 +35,7 @@ struct mce { __u64 ipid; /* MCA_IPID MSR: only valid on SMCA systems */ __u64 ppin; /* Protected Processor Inventory Number */ __u32 microcode; /* Microcode revision */ - __u64 kflags; /* Internal kernel use. See below */ + __u64 kflags; /* Internal kernel use */ }; #define MCE_GET_RECORD_LEN _IOR('M', 1, int)