History

Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up fixes.

Arnaldo Carvalho de Melo committed 5 years ago

Commit cd07e532 parents 47fddcb 45dfb8a872 files · +9357 −5038Browse files

Showing the changes to tools/include/uapi (1 of 872 files). Show all

Unified · Split

tools/include/uapi/linux/kvm.h+2−0
@@ -251,6 +251,7 @@ struct kvm_hyperv_exit { · 250 unmodified lines
251#define KVM_EXIT_X86_RDMSR 29251#define KVM_EXIT_X86_RDMSR 29
252#define KVM_EXIT_X86_WRMSR 30252#define KVM_EXIT_X86_WRMSR 30
253#define KVM_EXIT_DIRTY_RING_FULL 31253#define KVM_EXIT_DIRTY_RING_FULL 31
254#define KVM_EXIT_AP_RESET_HOLD 32
254 255
255/* For KVM_EXIT_INTERNAL_ERROR */256/* For KVM_EXIT_INTERNAL_ERROR */
256/* Emulate instruction failed. */257/* Emulate instruction failed. */
@@ -573,6 +574,7 @@ struct kvm_vapic_addr { · 316 unmodified lines
573#define KVM_MP_STATE_CHECK_STOP 6574#define KVM_MP_STATE_CHECK_STOP 6
574#define KVM_MP_STATE_OPERATING 7575#define KVM_MP_STATE_OPERATING 7
575#define KVM_MP_STATE_LOAD 8576#define KVM_MP_STATE_LOAD 8
577#define KVM_MP_STATE_AP_RESET_HOLD 9
576 578
577struct kvm_mp_state {579struct kvm_mp_state {
578 __u32 mp_state;580 __u32 mp_state;