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

Commit d7d53886 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull perf fixes from Ingo Molnar:
 "Tooling fixes mostly, plus a build warning fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
  perf/core: Move inline keyword at the beginning of declaration
  tools/headers: Pick up latest kernel ABIs
  perf tools: Fix crash caused by accessing feat_ops[HEADER_LAST_FEATURE]
  perf script: Fix crash because of missing evsel->priv
  perf script: Add missing output fields in a hint
  perf bench: Fix numa report output code
  perf stat: Remove duplicate event counting
  perf alias: Rebuild alias expression string to make it comparable
  perf alias: Remove trailing newline when reading sysfs files
  perf tools: Fix a clang 7.0 compilation error
  tools include uapi: Synchronize bpf.h with the kernel
  tools include uapi: Update if_link.h to pick IFLA_{BRPORT_ISOLATED,VXLAN_TTL_INHERIT}
  tools include powerpc: Update arch/powerpc/include/uapi/asm/unistd.h copy to get 'rseq' syscall
  perf tools: Update x86's syscall_64.tbl, adding 'io_pgetevents' and 'rseq'
  tools headers uapi: Synchronize drm/drm.h
  perf intel-pt: Fix packet decoding of CYC packets
  perf tests: Add valid callback for parse-events test
  perf tests: Add event parsing error handling to parse events test
  perf report powerpc: Fix crash if callchain is empty
  perf test session topology: Fix test on s390
  ...
parents 34a484d5 93315101

kernel/events/core.c

+1 −1
Original line number Diff line number Diff line
@@ -6482,7 +6482,7 @@ void perf_prepare_sample(struct perf_event_header *header, 
		data->phys_addr = perf_virt_to_phys(data->addr);

}



static void __always_inline

static __always_inline void

__perf_event_output(struct perf_event *event,

		    struct perf_sample_data *data,

		    struct pt_regs *regs,

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

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ struct kvm_regs { 
#define KVM_VGIC_V3_ADDR_TYPE_DIST	2

#define KVM_VGIC_V3_ADDR_TYPE_REDIST	3

#define KVM_VGIC_ITS_ADDR_TYPE		4

#define KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION	5



#define KVM_VGIC_V3_DIST_SIZE		SZ_64K

#define KVM_VGIC_V3_REDIST_SIZE		(2 * SZ_64K)

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

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ struct kvm_regs { 
#define KVM_VGIC_V3_ADDR_TYPE_DIST	2

#define KVM_VGIC_V3_ADDR_TYPE_REDIST	3

#define KVM_VGIC_ITS_ADDR_TYPE		4

#define KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION	5



#define KVM_VGIC_V3_DIST_SIZE		SZ_64K

#define KVM_VGIC_V3_REDIST_SIZE		(2 * SZ_64K)

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

+1 −0
Original line number Diff line number Diff line
@@ -633,6 +633,7 @@ struct kvm_ppc_cpu_char { 
#define KVM_REG_PPC_PSSCR	(KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xbd)



#define KVM_REG_PPC_DEC_EXPIRY	(KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xbe)

#define KVM_REG_PPC_ONLINE	(KVM_REG_PPC | KVM_REG_SIZE_U32 | 0xbf)



/* Transactional Memory checkpointed state:

 * This is all GPRs, all VSX regs and a subset of SPRs

tools/arch/powerpc/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -398,5 +398,6 @@ 
#define __NR_pkey_alloc		384

#define __NR_pkey_free		385

#define __NR_pkey_mprotect	386

#define __NR_rseq		387



#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */