Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[pandora-kernel.git] / arch / s390 / include / asm / kvm_host.h

diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index cef7dbf..00ff00d 100644 (file)
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -93,9 +93,7 @@ struct kvm_s390_sie_block {
        __u32   scaol;                  /* 0x0064 */
        __u8    reserved68[4];          /* 0x0068 */
        __u32   todpr;                  /* 0x006c */
-       __u8    reserved70[16];         /* 0x0070 */
-       __u64   gmsor;                  /* 0x0080 */
-       __u64   gmslm;                  /* 0x0088 */
+       __u8    reserved70[32];         /* 0x0070 */
        psw_t   gpsw;                   /* 0x0090 */
        __u64   gg14;                   /* 0x00a0 */
        __u64   gg15;                   /* 0x00a8 */
@@ -138,6 +136,7 @@ struct kvm_vcpu_stat {
        u32 instruction_chsc;
        u32 instruction_stsi;
        u32 instruction_stfl;
+       u32 instruction_tprot;
        u32 instruction_sigp_sense;
        u32 instruction_sigp_emergency;
        u32 instruction_sigp_stop;
@@ -175,6 +174,10 @@ struct kvm_s390_prefix_info {
        __u32 address;
 };
 
+struct kvm_s390_emerg_info {
+       __u16 code;
+};
+
 struct kvm_s390_interrupt_info {
        struct list_head list;
        u64     type;
@@ -182,6 +185,7 @@ struct kvm_s390_interrupt_info {
                struct kvm_s390_io_info io;
                struct kvm_s390_ext_info ext;
                struct kvm_s390_pgm_info pgm;
+               struct kvm_s390_emerg_info emerg;
                struct kvm_s390_prefix_info prefix;
        };
 };
@@ -226,6 +230,7 @@ struct kvm_vcpu_arch {
                struct cpuid    cpu_id;
                u64             stidp_data;
        };
+       struct gmap *gmap;
 };
 
 struct kvm_vm_stat {
@@ -236,6 +241,7 @@ struct kvm_arch{
        struct sca_block *sca;
        debug_info_t *dbf;
        struct kvm_s390_float_interrupt float_int;
+       struct gmap *gmap;
 };
 
 extern int sie64a(struct kvm_s390_sie_block *, unsigned long *);