From: Felix Beck <felix.beck@de.ibm.com>
Date: Wed, 5 Jan 2011 11:46:44 +0000 (+0100)
Subject: zcrypt: Fix check to look for facility bits 2 & 65
X-Git-Tag: v2.6.37.1~205
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1db40aa0b40fc685f351f57c1a6889dc39d206ab;p=users%2Fdwmw2%2Flinux.git

zcrypt: Fix check to look for facility bits 2 & 65

commit 53ec24b1e6c7118a127cf029a1519a2ce55268ec upstream.

Fix the check for ap interupts to look for facility bits 2 and 65.
Make sure that we only register interrupts for aps, if the machine
has ap interrupt support.

This patch is relevant only for the 2.6.37 stable series.

Signed-off-by: Felix Beck <felix.beck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 8fd8c62455e94..a1ba52a09602c 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -154,7 +154,7 @@ static inline int ap_instructions_available(void)
  */
 static int ap_interrupts_available(void)
 {
-	return test_facility(1) && test_facility(2);
+	return test_facility(2) && test_facility(65);
 }
 
 /**