Commit 798048f8 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-5.6-20200306' of... 

Merge tag 'perf-urgent-for-mingo-5.6-20200306' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

perf top:

  Tommi Rantala:

  - Fix stdio interface input handling with glibc 2.28+.

perf bench:

  Tommi Rantala:

  - Restore thread count default to online CPU count in futex-wake bench.

perf jevents:

  John Garry:

  - Fix leak of mapfile memory.

perf diff:

  Nick Desaulniers:

  - Fix undefined string comparision spotted by clang's -Wstring-compare.

misc:

  Ian Rogers:

  - Fix off-by 1 relative directory includes.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents b95b4d5e 441b62ac

tools/include/uapi/asm/errno.h

+7 −7
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#if defined(__i386__) || defined(__x86_64__)

#include "../../arch/x86/include/uapi/asm/errno.h"

#include "../../../arch/x86/include/uapi/asm/errno.h"

#elif defined(__powerpc__)

#include "../../arch/powerpc/include/uapi/asm/errno.h"

#include "../../../arch/powerpc/include/uapi/asm/errno.h"

#elif defined(__sparc__)

#include "../../arch/sparc/include/uapi/asm/errno.h"

#include "../../../arch/sparc/include/uapi/asm/errno.h"

#elif defined(__alpha__)

#include "../../arch/alpha/include/uapi/asm/errno.h"

#include "../../../arch/alpha/include/uapi/asm/errno.h"

#elif defined(__mips__)

#include "../../arch/mips/include/uapi/asm/errno.h"

#include "../../../arch/mips/include/uapi/asm/errno.h"

#elif defined(__ia64__)

#include "../../arch/ia64/include/uapi/asm/errno.h"

#include "../../../arch/ia64/include/uapi/asm/errno.h"

#elif defined(__xtensa__)

#include "../../arch/xtensa/include/uapi/asm/errno.h"

#include "../../../arch/xtensa/include/uapi/asm/errno.h"

#else

#include <asm-generic/errno.h>

#endif

tools/perf/arch/arm64/util/arm-spe.c

+10 −10
Original line number Diff line number Diff line
@@ -11,17 +11,17 @@ 
#include <linux/zalloc.h>

#include <time.h>



#include "../../util/cpumap.h"

#include "../../util/event.h"

#include "../../util/evsel.h"

#include "../../util/evlist.h"

#include "../../util/session.h"

#include "../../../util/cpumap.h"

#include "../../../util/event.h"

#include "../../../util/evsel.h"

#include "../../../util/evlist.h"

#include "../../../util/session.h"

#include <internal/lib.h> // page_size

#include "../../util/pmu.h"

#include "../../util/debug.h"

#include "../../util/auxtrace.h"

#include "../../util/record.h"

#include "../../util/arm-spe.h"

#include "../../../util/pmu.h"

#include "../../../util/debug.h"

#include "../../../util/auxtrace.h"

#include "../../../util/record.h"

#include "../../../util/arm-spe.h"



#define KiB(x) ((x) * 1024)

#define MiB(x) ((x) * 1024 * 1024)

tools/perf/arch/arm64/util/perf_regs.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include "../../util/perf_regs.h"

#include "../../../util/perf_regs.h"



const struct sample_reg sample_reg_masks[] = {

	SMPL_REG_END

tools/perf/arch/powerpc/util/perf_regs.c

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
#include <regex.h>

#include <linux/zalloc.h>



#include "../../util/perf_regs.h"

#include "../../util/debug.h"

#include "../../../util/perf_regs.h"

#include "../../../util/debug.h"



#include <linux/kernel.h>

tools/perf/arch/x86/util/auxtrace.c

+7 −7
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ 
#include <errno.h>

#include <stdbool.h>



#include "../../util/header.h"

#include "../../util/debug.h"

#include "../../util/pmu.h"

#include "../../util/auxtrace.h"

#include "../../util/intel-pt.h"

#include "../../util/intel-bts.h"

#include "../../util/evlist.h"

#include "../../../util/header.h"

#include "../../../util/debug.h"

#include "../../../util/pmu.h"

#include "../../../util/auxtrace.h"

#include "../../../util/intel-pt.h"

#include "../../../util/intel-bts.h"

#include "../../../util/evlist.h"



static

struct auxtrace_record *auxtrace_record__init_intel(struct evlist *evlist,

CRA Git | Maintained and supported by SUSTech CRA and CCSE