Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b00eb8a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Ingo writes:
  "perf fixes:

   Misc perf tooling fixes."

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf tools: Stop fallbacking to kallsyms for vdso symbols lookup
  perf tools: Pass build flags to traceevent build
  perf report: Don't crash on invalid inline debug information
  perf cpu_map: Align cpu map synthesized events properly.
  perf tools: Fix tracing_path_mount proper path
  perf tools: Fix use of alternatives to find JDIR
  perf evsel: Store ids for events with their own cpus perf_event__synthesize_event_update_cpus
  perf vendor events intel: Fix wrong filter_band* values for uncore events
  Revert "perf tools: Fix PMU term format max value calculation"
  tools headers uapi: Sync kvm.h copy
  tools arch uapi: Sync the x86 kvm.h copy
parents 270b77a0 20e8e72d

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

+1 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ struct kvm_sync_regs { 


#define KVM_X86_QUIRK_LINT0_REENABLED	(1 << 0)

#define KVM_X86_QUIRK_CD_NW_CLEARED	(1 << 1)

#define KVM_X86_QUIRK_LAPIC_MMIO_HOLE	(1 << 2)



#define KVM_STATE_NESTED_GUEST_MODE	0x00000001

#define KVM_STATE_NESTED_RUN_PENDING	0x00000002

tools/include/uapi/linux/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -952,6 +952,7 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_S390_HPAGE_1M 156

#define KVM_CAP_NESTED_STATE 157

#define KVM_CAP_ARM_INJECT_SERROR_ESR 158

#define KVM_CAP_MSR_PLATFORM_INFO 159



#ifdef KVM_CAP_IRQ_ROUTING

tools/lib/api/fs/tracing_path.c

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static const char *tracing_path_tracefs_mount(void) 


	__tracing_path_set("", mnt);



	return mnt;

	return tracing_path;

}



static const char *tracing_path_debugfs_mount(void)
@@ -49,7 +49,7 @@ static const char *tracing_path_debugfs_mount(void) 


	__tracing_path_set("tracing/", mnt);



	return mnt;

	return tracing_path;

}



const char *tracing_path_mount(void)

tools/perf/Makefile.config

+1 −1
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ ifndef NO_JVMTI 
    JDIR=$(shell /usr/sbin/update-java-alternatives -l | head -1 | awk '{print $$3}')

  else

    ifneq (,$(wildcard /usr/sbin/alternatives))

      JDIR=$(shell alternatives --display java | tail -1 | cut -d' ' -f 5 | sed 's%/jre/bin/java.%%g')

      JDIR=$(shell /usr/sbin/alternatives --display java | tail -1 | cut -d' ' -f 5 | sed 's%/jre/bin/java.%%g')

    endif

  endif

  ifndef JDIR

tools/perf/Makefile.perf

+1 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ $(LIBPERF_IN): prepare FORCE 
$(LIB_FILE): $(LIBPERF_IN)

	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIBPERF_IN) $(LIB_OBJS)



LIBTRACEEVENT_FLAGS += plugin_dir=$(plugindir_SQ)

LIBTRACEEVENT_FLAGS += plugin_dir=$(plugindir_SQ) 'EXTRA_CFLAGS=$(EXTRA_CFLAGS)' 'LDFLAGS=$(LDFLAGS)'



$(LIBTRACEEVENT): FORCE

	$(Q)$(MAKE) -C $(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) O=$(OUTPUT) $(OUTPUT)libtraceevent.a