Commit 9d9cc4aa 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:
 "Various fixes:

   - synchronize kernel and tooling headers

   - cgroup support fix

   - two tooling fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tools/headers: Synchronize kernel ABI headers
  perf/cgroup: Fix perf cgroup hierarchy support
  perf tools: Unwind properly location after REJECT
  perf symbols: Fix memory corruption because of zero length symbols
parents c84e6d01 fb7df12d

kernel/events/core.c

+4 −2
Original line number Diff line number Diff line
@@ -901,9 +901,11 @@ list_update_cgroup_event(struct perf_event *event, 
	cpuctx_entry = &cpuctx->cgrp_cpuctx_entry;

	/* cpuctx->cgrp is NULL unless a cgroup event is active in this CPU .*/

	if (add) {

		struct perf_cgroup *cgrp = perf_cgroup_from_task(current, ctx);



		list_add(cpuctx_entry, this_cpu_ptr(&cgrp_cpuctx_list));

		if (perf_cgroup_from_task(current, ctx) == event->cgrp)

			cpuctx->cgrp = event->cgrp;

		if (cgroup_is_descendant(cgrp->css.cgroup, event->cgrp->css.cgroup))

			cpuctx->cgrp = cgrp;

	} else {

		list_del(cpuctx_entry);

		cpuctx->cgrp = NULL;

tools/arch/x86/include/asm/disabled-features.h

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

#ifndef _ASM_X86_DISABLED_FEATURES_H

#define _ASM_X86_DISABLED_FEATURES_H

tools/arch/x86/include/asm/required-features.h

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

#ifndef _ASM_X86_REQUIRED_FEATURES_H

#define _ASM_X86_REQUIRED_FEATURES_H

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

+1 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _UAPI_ASM_X86_UNISTD_H

#define _UAPI_ASM_X86_UNISTD_H

tools/arch/x86/lib/memcpy_64.S

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

/* Copyright 2002 Andi Kleen */



#include <linux/linkage.h>

#include <asm/errno.h>

#include <asm/cpufeatures.h>

#include <asm/alternative-asm.h>

#include <asm/export.h>



/*

 * We build a jump to memcpy_orig by default which gets NOPped out on
@@ -41,6 +41,8 @@ ENTRY(memcpy) 
	ret

ENDPROC(memcpy)

ENDPROC(__memcpy)

EXPORT_SYMBOL(memcpy)

EXPORT_SYMBOL(__memcpy)



/*

 * memcpy_erms() - enhanced fast string memcpy. This is faster and
@@ -275,6 +277,7 @@ ENTRY(memcpy_mcsafe_unrolled) 
	xorq %rax, %rax

	ret

ENDPROC(memcpy_mcsafe_unrolled)

EXPORT_SYMBOL_GPL(memcpy_mcsafe_unrolled)



	.section .fixup, "ax"

	/* Return -EFAULT for any failure */

CRA Git | Maintained and supported by SUSTech CRA and CCSE