From 487dff5638b90bcdb5a800cd5a63ff4dacc8e677 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <hca@linux.ibm.com>
Date: Wed, 21 Jul 2021 21:03:44 +0200
Subject: [PATCH] s390/hwcaps: remove z/Architecture mode active check

Remove a leftover from the common 31/64 bit code. z/Architecture mode
is now always active, there is no need to check.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
---
 arch/s390/kernel/processor.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c
index 693f02018048b..6710a236d52fa 100644
--- a/arch/s390/kernel/processor.c
+++ b/arch/s390/kernel/processor.c
@@ -184,8 +184,7 @@ static int __init setup_hwcaps(void)
 		elf_hwcap |= HWCAP_ESAN3;
 
 	/* z/Architecture mode active */
-	if (test_facility(2))
-		elf_hwcap |= HWCAP_ZARCH;
+	elf_hwcap |= HWCAP_ZARCH;
 
 	/* store-facility-list-extended */
 	if (test_facility(7))
-- 
GitLab