From: Linus Torvalds Date: Sun, 23 May 2021 16:32:40 +0000 (-1000) Subject: Merge tag 'perf-urgent-2021-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v5.15~1074 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ebb6814a1ef9573d8488232b50dc53b394c025a;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'perf-urgent-2021-05-23' of git://git./linux/kernel/git/tip/tip Pull perf fixes from Thomas Gleixner: "Two perf fixes: - Do not check the LBR_TOS MSR when setting up unrelated LBR MSRs as this can cause malfunction when TOS is not supported - Allocate the LBR XSAVE buffers along with the DS buffers upfront because allocating them when adding an event can deadlock" * tag 'perf-urgent-2021-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/lbr: Remove cpuc->lbr_xsave allocation from atomic context perf/x86: Avoid touching LBR_TOS MSR for Arch LBR --- 6ebb6814a1ef9573d8488232b50dc53b394c025a