x86/mce: Switch to use new generic UUID API
Subsystems (2)
PATCH 1/1 x86/mce: Switch to use new generic UUID API
There are new types and helpers that are supposed to be used in new code.
As a preparation to get rid of legacy types and API functions do the conversion here.
Signed-off-by Andy Shevchenko <[email protected]>
--- arch/x86/kernel/cpu/mce/apei.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/kernel/cpu/mce/apei.c +5 -5
@@ -64,11 +64,11 @@ void apei_mce_report_mem_error(int severity, struct cper_sec_mem_err *mem_err)EXPORT_SYMBOL_GPL (apei_mce_report_mem_error);#define CPER_CREATOR_MCE \ - UUID_LE(0x75a574e3, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c, \ - 0x64, 0x90, 0xb8, 0x9d) + GUID_INIT(0x75a574e3, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c, \ + 0x64, 0x90, 0xb8, 0x9d)#define CPER_SECTION_TYPE_MCE \ - UUID_LE(0xfe08ffbe, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96, \ - 0x04, 0x4a, 0x38, 0xfc) + GUID_INIT(0xfe08ffbe, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96, \ + 0x04, 0x4a, 0x38, 0xfc)/* * CPER specification (in UEFI specification 2.3 appendix N) requires
@@ -135,7 +135,7 @@ ssize_t apei_read_mce(struct mce *m, u64 *record_id) goto out;/* try to skip other type records in storage */ else if (rc != sizeof(rcd) || - uuid_le_cmp(rcd.hdr.creator_id, CPER_CREATOR_MCE)) + !guid_equal(&rcd.hdr.creator_id, &CPER_CREATOR_MCE)) goto retry;memcpy (m, &rcd.mce,sizeof (*m)); rc =sizeof (*m);
Signature · 1 line
2.20.1
tip-bot for Andy Shevchenko
merge bot[tip:ras/core] x86/MCE: Switch to use the new generic UUID API
x86/MCE: Switch to use the new generic UUID API
Commit-ID: b62928ff55290e47a7d546d427bf7b4ccf5ea944 Gitweb: https://git.kernel.org/tip/b62928ff55290e47a7d546d427bf7b4ccf5ea944 Author: Andy Shevchenko <[email protected]> AuthorDate: Thu, 10 Jan 2019 17:36:45 +0200 Committer: Borislav Petkov <[email protected]> CommitDate: Mon, 14 Jan 2019 11:16:55 +0100
x86/MCE: Switch to use the new generic UUID API
Switch the code to use the new, generic helpers.
Signed-off-by Andy Shevchenko <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Tony Luck <[email protected]>
Cc x86-ml <[email protected]>
--- arch/x86/kernel/cpu/mce/apei.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/kernel/cpu/mce/apei.c +5 -5
@@ -64,11 +64,11 @@ void apei_mce_report_mem_error(int severity, struct cper_sec_mem_err *mem_err)EXPORT_SYMBOL_GPL (apei_mce_report_mem_error);#define CPER_CREATOR_MCE \ - UUID_LE(0x75a574e3, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c, \ - 0x64, 0x90, 0xb8, 0x9d) + GUID_INIT(0x75a574e3, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c, \ + 0x64, 0x90, 0xb8, 0x9d)#define CPER_SECTION_TYPE_MCE \ - UUID_LE(0xfe08ffbe, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96, \ - 0x04, 0x4a, 0x38, 0xfc) + GUID_INIT(0xfe08ffbe, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96, \ + 0x04, 0x4a, 0x38, 0xfc)/* * CPER specification (in UEFI specification 2.3 appendix N) requires
@@ -135,7 +135,7 @@ retry: goto out;/* try to skip other type records in storage */ else if (rc != sizeof(rcd) || - uuid_le_cmp(rcd.hdr.creator_id, CPER_CREATOR_MCE)) + !guid_equal(&rcd.hdr.creator_id, &CPER_CREATOR_MCE)) goto retry;memcpy (m, &rcd.mce,sizeof (*m)); rc =sizeof (*m);