diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 13:47:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 13:47:39 -0400 |
| commit | da1ba891f22835db9a2c349315c3763e9f4e4e67 (patch) | |
| tree | 958c53bfbe540c14370709d64c538e5c3f6cff2b /include/asm-s390/kvm_host.h | |
| parent | 8b2cc917a02936c3ea7d8da46801c7b7b6233093 (diff) | |
| parent | 45e576b1c3d0020607b8666c0247164e92c7d719 (diff) | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] guest page hinting light
[S390] tty3270: fix put_char fail/success conversion.
[S390] compat ptrace cleanup
[S390] s390mach compile warning
[S390] cio: Fix parsing mechanism for blacklisted devices.
[S390] cio: Remove cio_msg kernel parameter.
[S390] s390-kvm: leave sie context on work. Removes preemption requirement
[S390] s390: Optimize user and work TIF check
Diffstat (limited to 'include/asm-s390/kvm_host.h')
| -rw-r--r-- | include/asm-s390/kvm_host.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-s390/kvm_host.h b/include/asm-s390/kvm_host.h index f8204a4f2e02..18cbd8a39796 100644 --- a/include/asm-s390/kvm_host.h +++ b/include/asm-s390/kvm_host.h | |||
| @@ -104,6 +104,7 @@ struct sie_block { | |||
| 104 | 104 | ||
| 105 | struct kvm_vcpu_stat { | 105 | struct kvm_vcpu_stat { |
| 106 | u32 exit_userspace; | 106 | u32 exit_userspace; |
| 107 | u32 exit_null; | ||
| 107 | u32 exit_external_request; | 108 | u32 exit_external_request; |
| 108 | u32 exit_external_interrupt; | 109 | u32 exit_external_interrupt; |
| 109 | u32 exit_stop_request; | 110 | u32 exit_stop_request; |