diff options
author | Mark Brown <broonie@kernel.org> | 2018-08-07 11:14:43 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-08-07 11:14:43 +0100 |
commit | 9320831dc88c215d47d1095c06253ac38d41f29d (patch) | |
tree | 9ea6ad6aad2b12cc58c2bcfd86092b7ce372ebea /arch/s390 | |
parent | 4fa7c16a310c6abbf6873659655c3e9fb1bdc4ce (diff) | |
parent | bffa1e42b3713aa7911cc3f9a6e5a2dbbf1dc789 (diff) |
Merge tag 'v4.4.146' into linux-linaro-lsk-v4.4
This is the 4.4.146 stable release
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/include/asm/cpu_mf.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/s390/include/asm/cpu_mf.h b/arch/s390/include/asm/cpu_mf.h index 9dd04b9e9782..b2f8c52b3840 100644 --- a/arch/s390/include/asm/cpu_mf.h +++ b/arch/s390/include/asm/cpu_mf.h @@ -113,7 +113,7 @@ struct hws_basic_entry { struct hws_diag_entry { unsigned int def:16; /* 0-15 Data Entry Format */ - unsigned int R:14; /* 16-19 and 20-30 reserved */ + unsigned int R:15; /* 16-19 and 20-30 reserved */ unsigned int I:1; /* 31 entry valid or invalid */ u8 data[]; /* Machine-dependent sample data */ } __packed; @@ -129,7 +129,9 @@ struct hws_trailer_entry { unsigned int f:1; /* 0 - Block Full Indicator */ unsigned int a:1; /* 1 - Alert request control */ unsigned int t:1; /* 2 - Timestamp format */ - unsigned long long:61; /* 3 - 63: Reserved */ + unsigned int :29; /* 3 - 31: Reserved */ + unsigned int bsdes:16; /* 32-47: size of basic SDE */ + unsigned int dsdes:16; /* 48-63: size of diagnostic SDE */ }; unsigned long long flags; /* 0 - 63: All indicators */ }; |