Skip to content

Commit

Permalink
RAS: Use consistent types for UUIDs
Browse files Browse the repository at this point in the history
The commit

  297b64c ("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]
  • Loading branch information
andy-shev authored and suryasaimadhu committed Jan 25, 2019
1 parent 30aa3d2 commit 9359a8c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/ras/ras.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
8 changes: 4 additions & 4 deletions include/ras/ras_event.h
Original file line number Diff line number Diff line change
Expand Up @@ -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),

Expand All @@ -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)
),
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 9359a8c

Please sign in to comment.