[Qemu-devel] [PULL 1/4] tcg/s390: Fix merge error with facilities

[Richard Henderson]

The variable was renamed s390_facilities.

Signed-off-by: Richard Henderson <address@hidden>
---
 tcg/s390/tcg-target.inc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c
index 0682d01..a679280 100644
--- a/tcg/s390/tcg-target.inc.c
+++ b/tcg/s390/tcg-target.inc.c
@@ -1096,7 +1096,7 @@ static int tgen_cmp(TCGContext *s, TCGType type, TCGCond 
c, TCGReg r1,
             /* If we only got here because of load-and-test,
                and we couldn't use that, then we need to load
                the constant into a register.  */
-            if (!(facilities & FACILITY_EXT_IMM)) {
+            if (!(s390_facilities & FACILITY_EXT_IMM)) {
                 c2 = TCG_TMP0;
                 tcg_out_movi(s, type, c2, 0);
                 goto do_reg;
-- 
2.9.3