Merge branches 'ns9x' and 'machtypes' into devel

[firefly-linux-kernel-4.4.55.git] / include / asm-ia64 / kvm_host.h

diff --git a/include/asm-ia64/kvm_host.h b/include/asm-ia64/kvm_host.h
index d6d6e15c19244396b51230e3ec43725731237f33..c082c208c1f339085208686129da12a7bdf7c6a6 100644 (file)
--- a/include/asm-ia64/kvm_host.h
+++ b/include/asm-ia64/kvm_host.h
@@ -318,10 +318,10 @@ struct kvm_vcpu_arch {
        int vmm_tr_slot;
        int vm_tr_slot;
 
-#define VCPU_MP_STATE_RUNNABLE          0
-#define VCPU_MP_STATE_UNINITIALIZED     1
-#define VCPU_MP_STATE_INIT_RECEIVED     2
-#define VCPU_MP_STATE_HALTED            3
+#define KVM_MP_STATE_RUNNABLE          0
+#define KVM_MP_STATE_UNINITIALIZED     1
+#define KVM_MP_STATE_INIT_RECEIVED     2
+#define KVM_MP_STATE_HALTED            3
        int mp_state;
 
 #define MAX_PTC_G_NUM                  3