]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drivers/perf: riscv: Remove redundant macro check
authorXiao Wang <xiao.w.wang@intel.com>
Mon, 8 Jul 2024 12:12:24 +0000 (20:12 +0800)
committerPalmer Dabbelt <palmer@rivosinc.com>
Mon, 16 Sep 2024 03:15:48 +0000 (20:15 -0700)
The macro CONFIG_RISCV_PMU must have been defined when riscv_pmu.c gets
compiled, so this patch removes the redundant check.

Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
Link: https://lore.kernel.org/r/20240708121224.1148154-1-xiao.w.wang@intel.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
drivers/perf/riscv_pmu.c

index 0a02e85a895138e4e976bc66ad80fa269dad5828..7644147d50b46a79f349d6cb7e32554cc9a39a74 100644 (file)
@@ -39,7 +39,6 @@ void arch_perf_update_userpage(struct perf_event *event,
        userpg->cap_user_time_short = 0;
        userpg->cap_user_rdpmc = riscv_perf_user_access(event);
 
-#ifdef CONFIG_RISCV_PMU
        /*
         * The counters are 64-bit but the priv spec doesn't mandate all the
         * bits to be implemented: that's why, counter width can vary based on
@@ -47,7 +46,6 @@ void arch_perf_update_userpage(struct perf_event *event,
         */
        if (userpg->cap_user_rdpmc)
                userpg->pmc_width = to_riscv_pmu(event->pmu)->ctr_get_width(event->hw.idx) + 1;
-#endif
 
        do {
                rd = sched_clock_read_begin(&seq);