From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Thu, 27 Apr 2017 05:29:40 +0000 (+0200)
Subject: Merge branch 's390forkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d0790fb6e5bc5a6bb923de9c2be7fc210d6b689b;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 's390forkvm' of git://git./linux/kernel/git/kvms390/linux into features

Pull cpacf changes for KVM from Jason Herne:

Add query support for the KMA instruction.
---

d0790fb6e5bc5a6bb923de9c2be7fc210d6b689b
diff --cc arch/s390/include/asm/cpacf.h
index 7707a35176c4,31cac7d17b48..e06f2556b316
--- a/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