diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-06-28 12:57:47 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-06-28 12:57:47 +0200 |
| commit | 9e293b5a7062981016ace93160c56a980fcb73b8 (patch) | |
| tree | 69f557de9c1a1c2deaa28bdc42f8228a33247116 /arch/s390/include/asm/processor.h | |
| parent | 795c9a5106119f45d2501c4fb01051178904753f (diff) | |
| parent | da72ca4d4090a8ab0e6b0a23682ef42d39d7ae00 (diff) | |
| download | talos-op-linux-9e293b5a7062981016ace93160c56a980fcb73b8.tar.gz talos-op-linux-9e293b5a7062981016ace93160c56a980fcb73b8.zip | |
Merge tag 'nmiforkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into features
Pull kvm patches from Christian Borntraeger:
"s390,kvm: provide plumbing for machines checks when running guests"
This provides the basic plumbing for handling machine checks when
running guests
Diffstat (limited to 'arch/s390/include/asm/processor.h')
| -rw-r--r-- | arch/s390/include/asm/processor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h index f57c017a5c03..72c7b88f8d2c 100644 --- a/arch/s390/include/asm/processor.h +++ b/arch/s390/include/asm/processor.h @@ -20,6 +20,7 @@ #define CIF_FPU 4 /* restore FPU registers */ #define CIF_IGNORE_IRQ 5 /* ignore interrupt (for udelay) */ #define CIF_ENABLED_WAIT 6 /* in enabled wait state */ +#define CIF_MCCK_GUEST 7 /* machine check happening in guest */ #define _CIF_MCCK_PENDING _BITUL(CIF_MCCK_PENDING) #define _CIF_ASCE_PRIMARY _BITUL(CIF_ASCE_PRIMARY) @@ -28,6 +29,7 @@ #define _CIF_FPU _BITUL(CIF_FPU) #define _CIF_IGNORE_IRQ _BITUL(CIF_IGNORE_IRQ) #define _CIF_ENABLED_WAIT _BITUL(CIF_ENABLED_WAIT) +#define _CIF_MCCK_GUEST _BITUL(CIF_MCCK_GUEST) #ifndef __ASSEMBLY__ |
