Commit-ID: 9359a8cbcc77d4afb07444f341e39015d232bd55
Gitweb: https://git.kernel.org/tip/9359a8cbcc77d4afb07444f341e39015d232bd55
Author: Andy Shevchenko <[email protected]>
AuthorDate: Fri, 25 Jan 2019 16:30:35 +0200
Committer: Borislav Petkov <[email protected]>
CommitDate: Fri, 25 Jan 2019 16:40:40 +0100
RAS: Use consistent types for UUIDs
The commit
297b64c74385 ("ras: acpi / apei: generate trace event for unrecognized CPER
section")
brought inconsistency in UUID types which are used across the RAS
subsystem.
Fix this by using guid_t everywhere.
Signed-off-by: Andy Shevchenko <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: "Steven Rostedt (VMware)" <[email protected]>
Cc: Bjorn Helgaas <[email protected]>
Cc: Thomas Tai <[email protected]>
Cc: Tony Luck <[email protected]>
Cc: Tyler Baicar <[email protected]>
Link:
https://lkml.kernel.org/r/[email protected]
---
drivers/ras/ras.c | 2 +-
include/ras/ras_event.h | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c
index 3f38907320dc..95540ea8dd9d 100644
--- a/drivers/ras/ras.c
+++ b/drivers/ras/ras.c
@@ -14,7 +14,7 @@
#define TRACE_INCLUDE_PATH ../../include/ras
#include <ras/ras_event.h>
-void log_non_standard_event(const uuid_le *sec_type, const uuid_le *fru_id,
+void log_non_standard_event(const guid_t *sec_type, const guid_t *fru_id,
const char *fru_text, const u8 sev, const u8 *err,
const u32 len)
{
diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h
index a0794632fd01..36c5c5e38c1d 100644
--- a/include/ras/ras_event.h
+++ b/include/ras/ras_event.h
@@ -27,7 +27,7 @@
TRACE_EVENT(extlog_mem_event,
TP_PROTO(struct cper_sec_mem_err *mem,
u32 err_seq,
- const uuid_le *fru_id,
+ const guid_t *fru_id,
const char *fru_text,
u8 sev),
@@ -39,7 +39,7 @@ TRACE_EVENT(extlog_mem_event,
__field(u8, sev)
__field(u64, pa)
__field(u8, pa_mask_lsb)
- __field_struct(uuid_le, fru_id)
+ __field_struct(guid_t, fru_id)
__string(fru_text, fru_text)
__field_struct(struct cper_mem_err_compact, data)
),
@@ -218,8 +218,8 @@ TRACE_EVENT(arm_event,
*/
TRACE_EVENT(non_standard_event,
- TP_PROTO(const uuid_le *sec_type,
- const uuid_le *fru_id,
+ TP_PROTO(const guid_t *sec_type,
+ const guid_t *fru_id,
const char *fru_text,
const u8 sev,
const u8 *err,
