Merge branch 's390forkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390...

Pull cpacf changes for KVM from Jason Herne:

Add query support for the KMA instruction.

diff --cc arch/s390/include/asm/cpacf.h
index 7707a35176c4ad3554bcb0e8e8af00ebce20fe04,31cac7d17b48815832fef02f81c6fc8886d2732a..e06f2556b31641909e6f6915b770a8644aa3cbad
--- 1/arch/s390/include/asm/cpacf.h
--- 2/arch/s390/include/asm/cpacf.h
+++ b/arch/s390/include/asm/cpacf.h
@@@ -25,7 -25,8 +25,8 @@@
  #define CPACF_KMO             0xb92b          /* MSA4 */
  #define CPACF_PCC             0xb92c          /* MSA4 */
  #define CPACF_KMCTR           0xb92d          /* MSA4 */
 -#define CPACF_PPNO            0xb93c          /* MSA5 */
 +#define CPACF_PRNO            0xb93c          /* MSA5 */
+ #define CPACF_KMA             0xb929          /* MSA8 */
  
  /*
   * En/decryption modifier bits