1 files changed, 19 insertions, 19 deletions

diff --git a/include/asm-s390/kvm_host.h b/include/asm-s390/kvm_host.h
index 18cbd8a39796..3c55e4107dcc 100644
--- a/include/asm-s390/kvm_host.h
+++ b/include/asm-s390/kvm_host.h
@@ -62,7 +62,7 @@ struct sca_block {
 #define CPUSTAT_J          0x00000002
 #define CPUSTAT_P          0x00000001
 
-struct sie_block {
+struct kvm_s390_sie_block {
         atomic_t cpuflags;              /* 0x0000 */
         __u32   prefix;                 /* 0x0004 */
         __u8    reserved8[32];          /* 0x0008 */
@@ -111,7 +111,7 @@ struct kvm_vcpu_stat {
         u32 exit_validity;
         u32 exit_instruction;
         u32 instruction_lctl;
-        u32 instruction_lctg;
+        u32 instruction_lctlg;
         u32 exit_program_interruption;
         u32 exit_instr_and_program;
         u32 deliver_emergency_signal;
@@ -140,14 +140,14 @@ struct kvm_vcpu_stat {
         u32 diagnose_44;
 };
 
-struct io_info {
+struct kvm_s390_io_info {
         __u16        subchannel_id;            /* 0x0b8 */
         __u16        subchannel_nr;            /* 0x0ba */
         __u32        io_int_parm;              /* 0x0bc */
         __u32        io_int_word;              /* 0x0c0 */
 };
 
-struct ext_info {
+struct kvm_s390_ext_info {
         __u32 ext_params;
         __u64 ext_params2;
 };
@@ -160,22 +160,22 @@ struct ext_info {
 #define PGM_SPECIFICATION        0x06
 #define PGM_DATA                 0x07
 
-struct pgm_info {
+struct kvm_s390_pgm_info {
         __u16 code;
 };
 
-struct prefix_info {
+struct kvm_s390_prefix_info {
         __u32 address;
 };
 
-struct interrupt_info {
+struct kvm_s390_interrupt_info {
         struct list_head list;
         u64     type;
         union {
-                struct io_info io;
-                struct ext_info ext;
-                struct pgm_info pgm;
-                struct prefix_info prefix;
+                struct kvm_s390_io_info io;
+                struct kvm_s390_ext_info ext;
+                struct kvm_s390_pgm_info pgm;
+                struct kvm_s390_prefix_info prefix;
         };
 };
 
@@ -183,35 +183,35 @@ struct interrupt_info {
 #define ACTION_STORE_ON_STOP 1
 #define ACTION_STOP_ON_STOP  2
 
-struct local_interrupt {
+struct kvm_s390_local_interrupt {
         spinlock_t lock;
         struct list_head list;
         atomic_t active;
-        struct float_interrupt *float_int;
+        struct kvm_s390_float_interrupt *float_int;
         int timer_due; /* event indicator for waitqueue below */
         wait_queue_head_t wq;
         atomic_t *cpuflags;
         unsigned int action_bits;
 };
 
-struct float_interrupt {
+struct kvm_s390_float_interrupt {
         spinlock_t lock;
         struct list_head list;
         atomic_t active;
         int next_rr_cpu;
         unsigned long idle_mask [(64 + sizeof(long) - 1) / sizeof(long)];
-        struct local_interrupt *local_int[64];
+        struct kvm_s390_local_interrupt *local_int[64];
 };
 
 
 struct kvm_vcpu_arch {
-        struct sie_block *sie_block;
+        struct kvm_s390_sie_block *sie_block;
         unsigned long     guest_gprs[16];
         s390_fp_regs      host_fpregs;
         unsigned int      host_acrs[NUM_ACRS];
         s390_fp_regs      guest_fpregs;
         unsigned int      guest_acrs[NUM_ACRS];
-        struct local_interrupt local_int;
+        struct kvm_s390_local_interrupt local_int;
         struct timer_list ckc_timer;
         union  {
                 cpuid_t   cpu_id;
@@ -228,8 +228,8 @@ struct kvm_arch{
         unsigned long guest_memsize;
         struct sca_block *sca;
         debug_info_t *dbf;
-        struct float_interrupt float_int;
+        struct kvm_s390_float_interrupt float_int;
 };
 
-extern int sie64a(struct sie_block *, __u64 *);
+extern int sie64a(struct kvm_s390_sie_block *, unsigned long *);
 #endif