Skip to content

Commit 9359a8c

Browse files
andy-shevsuryasaimadhu
authored andcommitted
RAS: Use consistent types for UUIDs
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]
1 parent 30aa3d2 commit 9359a8c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

drivers/ras/ras.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#define TRACE_INCLUDE_PATH ../../include/ras
1515
#include <ras/ras_event.h>
1616

17-
void log_non_standard_event(const uuid_le *sec_type, const uuid_le *fru_id,
17+
void log_non_standard_event(const guid_t *sec_type, const guid_t *fru_id,
1818
const char *fru_text, const u8 sev, const u8 *err,
1919
const u32 len)
2020
{

include/ras/ras_event.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
TRACE_EVENT(extlog_mem_event,
2828
TP_PROTO(struct cper_sec_mem_err *mem,
2929
u32 err_seq,
30-
const uuid_le *fru_id,
30+
const guid_t *fru_id,
3131
const char *fru_text,
3232
u8 sev),
3333

@@ -39,7 +39,7 @@ TRACE_EVENT(extlog_mem_event,
3939
__field(u8, sev)
4040
__field(u64, pa)
4141
__field(u8, pa_mask_lsb)
42-
__field_struct(uuid_le, fru_id)
42+
__field_struct(guid_t, fru_id)
4343
__string(fru_text, fru_text)
4444
__field_struct(struct cper_mem_err_compact, data)
4545
),
@@ -218,8 +218,8 @@ TRACE_EVENT(arm_event,
218218
*/
219219
TRACE_EVENT(non_standard_event,
220220

221-
TP_PROTO(const uuid_le *sec_type,
222-
const uuid_le *fru_id,
221+
TP_PROTO(const guid_t *sec_type,
222+
const guid_t *fru_id,
223223
const char *fru_text,
224224
const u8 sev,
225225
const u8 *err,

0 commit comments

Comments
 (0)