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 (2 of 872 files). Show all

Unified · Split

2 files

@@ -79,9 +79,4 @@ · 78 unmodified lines
79	#define __static_assert(expr, msg, ...) _Static_assert(expr, msg)	79	#define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
80	#endif // static_assert	80	#endif // static_assert
81		81
82	#ifdef __GENKSYMS__
83	/* genksyms gets confused by _Static_assert */
84	#define _Static_assert(expr, ...)
85	#endif
86
87	#endif /* _LINUX_BUILD_BUG_H */	82	#endif /* _LINUX_BUILD_BUG_H */

 #define KVM_EXIT_X86_RDMSR        29
 #define KVM_EXIT_X86_WRMSR        30
 #define KVM_EXIT_DIRTY_RING_FULL  31
+#define KVM_EXIT_AP_RESET_HOLD    32
 /* For KVM_EXIT_INTERNAL_ERROR */
 /* Emulate instruction failed. */
 #define KVM_MP_STATE_CHECK_STOP        6
 #define KVM_MP_STATE_OPERATING         7
 #define KVM_MP_STATE_LOAD              8
+#define KVM_MP_STATE_AP_RESET_HOLD     9
 struct kvm_mp_state {
 	__u32 mp_state;

Keyboard shortcuts