summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorHarald Freudenberger <freude@linux.ibm.com>2018-10-04 15:30:24 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-10-09 11:21:35 +0200
commitee410de890cdf8fc94f6235dd9ef323a101511ab (patch)
tree35e750a7374a2ded56bbea5ba81fb55b89e25773 /arch/s390
parent78333d1f908a25c9565d7518966cef717279fe32 (diff)
downloadlinux-ee410de890cdf8fc94f6235dd9ef323a101511ab.tar.bz2
s390/zcrypt: zcrypt device driver cleanup
Some cleanup in the s390 zcrypt device driver: - Removed fragments of pcixx crypto card code. This code can't be reached anymore because the hardware detection function does not recognize crypto cards < CEX2 since commit f56545430736 ("s390/zcrypt: Introduce QACT support for AP bus devices.") - Rename of some files and driver names which where still reflecting pcixx support to cex2a/cex2c. - Removed all the zcrypt version strings in the file headers. There is only one place left - the zcrypt.h header file is now the only place for zcrypt device driver version info. - Zcrypt version pump up from 2.2.0 to 2.2.1. Signed-off-by: Harald Freudenberger <freude@linux.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/include/uapi/asm/zcrypt.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/include/uapi/asm/zcrypt.h b/arch/s390/include/uapi/asm/zcrypt.h
index 196a3047fb0a..42c81a95e97b 100644
--- a/arch/s390/include/uapi/asm/zcrypt.h
+++ b/arch/s390/include/uapi/asm/zcrypt.h
@@ -2,7 +2,7 @@
/*
* include/asm-s390/zcrypt.h
*
- * zcrypt 2.2.0 (user-visible header)
+ * zcrypt 2.2.1 (user-visible header)
*
* Copyright IBM Corp. 2001, 2018
* Author(s): Robert Burroughs
@@ -16,7 +16,7 @@
#define ZCRYPT_VERSION 2
#define ZCRYPT_RELEASE 2
-#define ZCRYPT_VARIANT 0
+#define ZCRYPT_VARIANT 1
#include <linux/ioctl.h>
#include <linux/compiler.h>