diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2017-04-26 14:18:20 +0200 |
|---|---|---|
| committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2017-04-26 14:18:20 +0200 |
| commit | 0850e9219bd0d8fc337adb88c350b878f0dcbaa7 (patch) | |
| tree | 3e5846fd41307b868cbf4e78701bbcc4ab761c46 /arch/s390/include | |
| parent | 730cd632c4e485b90f97fe998e300045da094938 (diff) | |
| parent | 152c1c8d60ebedce8cc912c12f9be9ceca6c6671 (diff) | |
| download | op-kernel-dev-0850e9219bd0d8fc337adb88c350b878f0dcbaa7.zip op-kernel-dev-0850e9219bd0d8fc337adb88c350b878f0dcbaa7.tar.gz | |
Merge branch 's390forkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/cpacf.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/include/asm/cpacf.h b/arch/s390/include/asm/cpacf.h index e2dfbf2..31cac7d 100644 --- a/arch/s390/include/asm/cpacf.h +++ b/arch/s390/include/asm/cpacf.h @@ -26,6 +26,7 @@ #define CPACF_PCC 0xb92c /* MSA4 */ #define CPACF_KMCTR 0xb92d /* MSA4 */ #define CPACF_PPNO 0xb93c /* MSA5 */ +#define CPACF_KMA 0xb929 /* MSA8 */ /* * En/decryption modifier bits @@ -149,8 +150,8 @@ static inline void __cpacf_query(unsigned int opcode, cpacf_mask_t *mask) asm volatile( " spm 0\n" /* pckmo doesn't change the cc */ - /* Parameter registers are ignored, but may not be 0 */ - "0: .insn rrf,%[opc] << 16,2,2,2,0\n" + /* Parameter regs are ignored, but must be nonzero and unique */ + "0: .insn rrf,%[opc] << 16,2,4,6,0\n" " brc 1,0b\n" /* handle partial completion */ : "=m" (*mask) : [fc] "d" (r0), [pba] "a" (r1), [opc] "i" (opcode) |
