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 <andriy.shevchenko@linux.intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Thomas Tai <thomas.tai@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Tyler Baicar <tbaicar@codeaurora.org>
Link: https://lkml.kernel.org/r/20190125143035.81589-1-andriy.shevchenko@linux.intel.com

diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c
index 3f38907320dccd963246fb22008f35f8e9f52753..95540ea8dd9db905fa76019e9a0ce618c053a84c 100644 (file)
--- 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 a0794632fd01a4651942a326aecbaddaab5a93fa..36c5c5e38c1d8a0e7ec2757b03d7057b9cc68829 100644 (file)
--- 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,