[PATCH fixup] s390x: fixup for "s390x/cpumodel: add 3931 and 3932"

[Christian Borntraeger]

as discussed we want to change some facility names. Please merge

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 target/s390x/cpu_features_def.h.inc | 4 ++--
 target/s390x/gen-features.c         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/target/s390x/cpu_features_def.h.inc 
b/target/s390x/cpu_features_def.h.inc
index 6f92b155c3b1..33c67e36cf79 100644
--- a/target/s390x/cpu_features_def.h.inc
+++ b/target/s390x/cpu_features_def.h.inc
@@ -111,9 +111,9 @@ DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility")
 DEF_FEAT(UNPACK, "unpack", STFL, 161, "Unpack facility")
 DEF_FEAT(NNPA, "nnpa", STFL, 165, "NNPA facility")
 DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH2, "vxpdeh2", STFL, 192, 
"Vector-Packed-Decimal-Enhancement facility 2")
-DEF_FEAT(BEAR, "bear", STFL, 193, "BEAR-enhancement facility ")
+DEF_FEAT(BEAR_ENH, "beareh", STFL, 193, "BEAR-enhancement facility ")
 DEF_FEAT(RDP, "rdp", STFL, 194, "Reset-DAT-protection facility ")
-DEF_FEAT(ACTIVITY, "activity", STFL, 196, "Processor-Activity-Instrumentation 
facility ")
+DEF_FEAT(PAI, "pai", STFL, 196, "Processor-Activity-Instrumentation facility ")
 
 /* Features exposed via SCLP SCCB Byte 80 - 98  (bit numbers relative to 
byte-80) */
 DEF_FEAT(SIE_GSLS, "gsls", SCLP_CONF_CHAR, 40, "SIE: 
Guest-storage-limit-suppression facility")
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index a7396d3d5f30..7d85322d6814 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -572,9 +572,9 @@ static uint16_t full_GEN15_GA1[] = {
 static uint16_t full_GEN16_GA1[] = {
     S390_FEAT_NNPA,
     S390_FEAT_VECTOR_PACKED_DECIMAL_ENH2,
-    S390_FEAT_BEAR,
+    S390_FEAT_BEAR_ENH,
     S390_FEAT_RDP,
-    S390_FEAT_ACTIVITY,
+    S390_FEAT_PAI,
 };
 
 
-- 
2.31.1