lkml.org 
[lkml]   [2022]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[GIT pull] perf/urgent for v5.19-rc1
    Date
    Linus,

    please pull the latest perf/urgent branch from:

    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-2022-06-05

    up to: 8b4dd2d8627e: perf/core: Remove unused local variable


    Two small perf updates:

    - Make the ICL event constraints match reality

    - Remove a unused local variable


    Thanks,

    tglx

    ------------------>
    Haowen Bai (1):
    perf/core: Remove unused local variable

    Kan Liang (1):
    perf/x86/intel: Fix event constraints for ICL


    arch/x86/events/intel/core.c | 2 +-
    kernel/events/core.c | 1 -
    2 files changed, 1 insertion(+), 2 deletions(-)

    diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
    index 955ae91c56dc..45024abd929f 100644
    --- a/arch/x86/events/intel/core.c
    +++ b/arch/x86/events/intel/core.c
    @@ -276,7 +276,7 @@ static struct event_constraint intel_icl_event_constraints[] = {
    INTEL_EVENT_CONSTRAINT_RANGE(0x03, 0x0a, 0xf),
    INTEL_EVENT_CONSTRAINT_RANGE(0x1f, 0x28, 0xf),
    INTEL_EVENT_CONSTRAINT(0x32, 0xf), /* SW_PREFETCH_ACCESS.* */
    - INTEL_EVENT_CONSTRAINT_RANGE(0x48, 0x54, 0xf),
    + INTEL_EVENT_CONSTRAINT_RANGE(0x48, 0x56, 0xf),
    INTEL_EVENT_CONSTRAINT_RANGE(0x60, 0x8b, 0xf),
    INTEL_UEVENT_CONSTRAINT(0x04a3, 0xff), /* CYCLE_ACTIVITY.STALLS_TOTAL */
    INTEL_UEVENT_CONSTRAINT(0x10a3, 0xff), /* CYCLE_ACTIVITY.CYCLES_MEM_ANY */
    diff --git a/kernel/events/core.c b/kernel/events/core.c
    index 950b25c3f210..80782cddb1da 100644
    --- a/kernel/events/core.c
    +++ b/kernel/events/core.c
    @@ -4257,7 +4257,6 @@ static void perf_event_remove_on_exec(int ctxn)
    {
    struct perf_event_context *ctx, *clone_ctx = NULL;
    struct perf_event *event, *next;
    - LIST_HEAD(free_list);
    unsigned long flags;
    bool modified = false;

    \
     
     \ /
      Last update: 2022-06-05 11:31    [W:4.139 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site