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

tools/include/linux/build_bug.h +0 −5
tools/include/uapi/linux/kvm.h +2 −0

tools/include/linux/build_bug.h+0−5

@@ -79,9 +79,4 @@ · 78 unmodified lines
79	79	#define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
80	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	82	#endif /* _LINUX_BUILD_BUG_H */

tools/include/uapi/linux/kvm.h+2−0

@@ -251,6 +251,7 @@ struct kvm_hyperv_exit { · 250 unmodified lines
251	251	#define KVM_EXIT_X86_RDMSR 29
252	252	#define KVM_EXIT_X86_WRMSR 30
253	253	#define KVM_EXIT_DIRTY_RING_FULL 31
	254	+#define KVM_EXIT_AP_RESET_HOLD 32
254	255
255	256	/* For KVM_EXIT_INTERNAL_ERROR */
256	257	/* Emulate instruction failed. */
@@ -573,6 +574,7 @@ struct kvm_vapic_addr { · 316 unmodified lines
573	574	#define KVM_MP_STATE_CHECK_STOP 6
574	575	#define KVM_MP_STATE_OPERATING 7
575	576	#define KVM_MP_STATE_LOAD 8
	577	+#define KVM_MP_STATE_AP_RESET_HOLD 9
576	578
577	579	struct kvm_mp_state {
578	580	__u32 mp_state;