Merge tag 'perf-tools-fixes-2020-07-19' of... (92188b41) · Commits · 戴 / test

tools/arch/x86/include/uapi/asm/kvm.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -408,14 +408,15 @@ struct kvm_vmx_nested_state_data {
		};

		struct kvm_vmx_nested_state_hdr {
		__u32 flags;
		__u64 vmxon_pa;
		__u64 vmcs12_pa;
		__u64 preemption_timer_deadline;

		struct {
		__u16 flags;
		} smm;

		__u32 flags;
		__u64 preemption_timer_deadline;
		};

		struct kvm_svm_nested_state_data {

+3 −0

Original line number	Diff line number	Diff line
		@@ -237,6 +237,9 @@ static int get_value(struct parse_opt_ctx_t *p,
		return err;

		case OPTION_CALLBACK:
		if (opt->set)
		(bool )opt->set = true;

		if (unset)
		return (*opt->callback)(opt, NULL, 1) ? (-1) : 0;
		if (opt->flags & PARSE_OPT_NOARG)

+8 −4

Original line number	Diff line number	Diff line
		@@ -11,14 +11,18 @@
		#include <stdbool.h>
		#include <stddef.h>
		#include <limits.h>
		#ifndef __WORDSIZE
		#define __WORDSIZE (__SIZEOF_LONG__ * 8)
		#endif

		static inline size_t hash_bits(size_t h, int bits)
		{
		/* shuffle bits and return requested number of upper bits */
		return (h * 11400714819323198485llu) >> (__WORDSIZE - bits);
		#if (__SIZEOF_SIZE_T__ == __SIZEOF_LONG_LONG__)
		/* LP64 case */
		return (h * 11400714819323198485llu) >> (__SIZEOF_LONG_LONG__ * 8 - bits);
		#elif (__SIZEOF_SIZE_T__ <= __SIZEOF_LONG__)
		return (h * 2654435769lu) >> (__SIZEOF_LONG__ * 8 - bits);
		#else
		# error "Unsupported size_t size"
		#endif
		}

		typedef size_t (hashmap_hash_fn)(const void key, void *ctx);