Skip to content

Commit c9b5d15

Browse files
Thomas Richtergregkh
authored andcommitted
perf: fix invalid bit in diagnostic entry
[ Upstream commit 3c0a83b ] The s390 CPU measurement facility sampling mode supports basic entries and diagnostic entries. Each entry has a valid bit to indicate the status of the entry as valid or invalid. This bit is bit 31 in the diagnostic entry, but the bit mask definition refers to bit 30. Fix this by making the reserved field one bit larger. Fixes: 7e75fc3 ("s390/cpum_sf: Add raw data sampling to support the diagnostic-sampling function") Signed-off-by: Thomas Richter <[email protected]> Reviewed-by: Hendrik Brueckner <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d5d8223 commit c9b5d15

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/s390/include/asm/cpu_mf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ struct hws_basic_entry {
116116

117117
struct hws_diag_entry {
118118
unsigned int def:16; /* 0-15 Data Entry Format */
119-
unsigned int R:14; /* 16-19 and 20-30 reserved */
119+
unsigned int R:15; /* 16-19 and 20-30 reserved */
120120
unsigned int I:1; /* 31 entry valid or invalid */
121121
u8 data[]; /* Machine-dependent sample data */
122122
} __packed;

0 commit comments

Comments
 (0)