Commit 3f986eef authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core, to resolve conflict 



Conflicts:
	tools/perf/perf.h

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 55b4ce61 629ae2ee

arch/x86/events/intel/uncore_snbep.c

+1 −1
Original line number Diff line number Diff line
@@ -3606,7 +3606,7 @@ static struct intel_uncore_type skx_uncore_imc = { 
};



static struct attribute *skx_upi_uncore_formats_attr[] = {

	&format_attr_event_ext.attr,

	&format_attr_event.attr,

	&format_attr_umask_ext.attr,

	&format_attr_edge.attr,

	&format_attr_inv.attr,

tools/arch/x86/include/asm/cpufeatures.h

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ 
#define X86_FEATURE_SEV			( 7*32+20) /* AMD Secure Encrypted Virtualization */



#define X86_FEATURE_USE_IBPB		( 7*32+21) /* "" Indirect Branch Prediction Barrier enabled */

#define X86_FEATURE_USE_IBRS_FW		( 7*32+22) /* "" Use IBRS during runtime firmware calls */



/* Virtualization flags: Linux defined, word 8 */

#define X86_FEATURE_TPR_SHADOW		( 8*32+ 0) /* Intel TPR Shadow */

tools/include/uapi/linux/kvm.h

+2 −0
Original line number Diff line number Diff line
@@ -761,6 +761,7 @@ struct kvm_ppc_resize_hpt { 
#define KVM_TRACE_PAUSE           __KVM_DEPRECATED_MAIN_0x07

#define KVM_TRACE_DISABLE         __KVM_DEPRECATED_MAIN_0x08

#define KVM_GET_EMULATED_CPUID	  _IOWR(KVMIO, 0x09, struct kvm_cpuid2)

#define KVM_GET_MSR_FEATURE_INDEX_LIST    _IOWR(KVMIO, 0x0a, struct kvm_msr_list)



/*

 * Extension capability list.
@@ -934,6 +935,7 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_S390_AIS_MIGRATION 150

#define KVM_CAP_PPC_GET_CPU_CHAR 151

#define KVM_CAP_S390_BPB 152

#define KVM_CAP_GET_MSR_FEATURES 153



#ifdef KVM_CAP_IRQ_ROUTING

tools/perf/builtin-stat.c

+1 −1
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ static void print_metric_csv(void *ctx, 
	char buf[64], *vals, *ends;



	if (unit == NULL || fmt == NULL) {

		fprintf(out, "%s%s%s%s", csv_sep, csv_sep, csv_sep, csv_sep);

		fprintf(out, "%s%s", csv_sep, csv_sep);

		return;

	}

	snprintf(buf, sizeof(buf), fmt, val);

tools/perf/util/auxtrace.c

+9 −6
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ 
#include "sane_ctype.h"

#include "symbol/kallsyms.h"



static bool auxtrace__dont_decode(struct perf_session *session)

{

	return !session->itrace_synth_opts ||

	       session->itrace_synth_opts->dont_decode;

}



int auxtrace_mmap__mmap(struct auxtrace_mmap *mm,

			struct auxtrace_mmap_params *mp,

			void *userpg, int fd)
@@ -762,6 +768,9 @@ int auxtrace_queues__process_index(struct auxtrace_queues *queues, 
	size_t i;

	int err;



	if (auxtrace__dont_decode(session))

		return 0;



	list_for_each_entry(auxtrace_index, &session->auxtrace_index, list) {

		for (i = 0; i < auxtrace_index->nr; i++) {

			ent = &auxtrace_index->entries[i];
@@ -892,12 +901,6 @@ int perf_event__synthesize_auxtrace_info(struct auxtrace_record *itr, 
	return err;

}



static bool auxtrace__dont_decode(struct perf_session *session)

{

	return !session->itrace_synth_opts ||

	       session->itrace_synth_opts->dont_decode;

}



int perf_event__process_auxtrace_info(struct perf_tool *tool __maybe_unused,

				      union perf_event *event,

				      struct perf_session *session)