Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2104865pxb; Sun, 17 Oct 2021 06:04:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgmeoH65qQppXqa4BQ/cy/IEB1U12f5xz9ToNczUsFq2OpkapF5Y7KHr0N4JgWUGyCOZds X-Received: by 2002:a17:90b:390d:: with SMTP id ob13mr26455386pjb.49.1634475874541; Sun, 17 Oct 2021 06:04:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634475874; cv=none; d=google.com; s=arc-20160816; b=FrvLPKAzG2LZH1SaO2/i3mh0XfQznPXDSMgdKDVmxz6DQ5XWEtLw/90LsLFNolymtJ LJORkwObG/mD14axksvzC3vMMdoOiucHs3qRIAfa4v8ObsovlQoJnvH7Am1stzKtYpWy gg+yig1uEoVSydcWlw2IduZvx79GuNBlA2AJEGxsjo6Imbba0JCb3rflgl9sRclSwBhe SAb7VtLfFWiGfhvNmlKbcV+EDlqnkkKhSx4zkPRFHEuYWLFkPhhPv2ZE3xEdAGXRzOe+ i2frS61XY+NNeoSPh3xicr66+bM+zqYPbwnsZmicyti39Qf9K4AmvJ3ZJhtve2xHpNb0 Gk/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=XW2mCrDf1DUphwbsZwW9UQbbVujr91pVtxEQxiDp1EI=; b=Di6p2cNrEm1UvVVV7vbVKC1MEA5IhQL76hCAEN9R3JowdgR2EBEVS3cLGkD4J52H6A dPodzLI+7TEL1SugcLj13GFkEiPY9B2UO+beIDabkCKgn+fzrJa61Xdu8OLnAlSUqJsu S/GXkslycNRSuoTcpD2wYx+A5m5obQvCPb7LBFbftUm/lKmxV8HIABWp3ji4uHIZoJpS WHQo0ZPmmbDexB790gUU5hphHxuuOLWULGl9Wi1fqg4SKZvf1MDPOTkmpjnCjpzWmoHN FI2nSVqerDmBcFfYdL7luzJLTOMnqbw5bE4f5pOGNtjR248GBvrGoVWd2kRkHBEsOMV3 mOkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=NIPGrv9B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d27si19098438pgd.517.2021.10.17.06.04.06; Sun, 17 Oct 2021 06:04:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=NIPGrv9B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242191AbhJORX7 (ORCPT + 99 others); Fri, 15 Oct 2021 13:23:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242198AbhJORXw (ORCPT ); Fri, 15 Oct 2021 13:23:52 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 033F7C061764 for ; Fri, 15 Oct 2021 10:21:46 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id y18-20020a25a092000000b005bddb39f160so10459925ybh.10 for ; Fri, 15 Oct 2021 10:21:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=XW2mCrDf1DUphwbsZwW9UQbbVujr91pVtxEQxiDp1EI=; b=NIPGrv9BA/LZYfiUo7NPjx8EdPL1MouxnBhCEzjFTW27A3qVWCmbH3hVxMbYCaY8gz XrtutPqUji9pJtmI5wWSjcx4Pz9UxpTorp+vLGEOPSmpa3550/iJbee6b0lB/Ff+iN0W /hjRngvvu62glxs6KqMVqLBcn1juprlgRgpt69qBE+X1+u+YRF2LApZB53yx5NTdGXog RODcv0FdV/1GEK9QpLbZJ3G0IBPlY3/bS1Zoqi5lSe6YFnva4+J7WJdLdPMkxT6EyfHF LrqMdjXjpHQixdesuUINS6xlXZo4h0O//7xtg+iTy9HjBZ9Fl5Ez+0ZDvrxhXLL5eyA1 gjCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=XW2mCrDf1DUphwbsZwW9UQbbVujr91pVtxEQxiDp1EI=; b=ZdL36SFIVJyvyYUOEGHh37RyrEbXLvw0SmO+Jg3pWERaCMVeKlRvghq2+3TFEK5gdf 3XffzZqXGNjWoCf7m/UvvIqefwIZkR9M/qFEEUfeaOOJ+uMK+3u7QQfZZjs4DgHJ8jJk 7w7RBubTzV3tCmnqi0CiOZT/638XAnxpHA0WBtwNrhsq6k/so2irytoHqiTBVqpKPTXS 6oKP3ak4C7PeYFJw+kI0VdFaUU8p6JlQrN7K5YCiXRSPznLn5fdvzUjJFfqNHOwCtfPP Br+d32HJq+yXW3i8l45tgaOP1EKDwQaHfrtsbhkH481oQWVzTQa0TdnLpKKEsOE1puOy PnDQ== X-Gm-Message-State: AOAM530SivN9dfVdmixCFNlqDndwfKmC0t+A19Foa627maA6EKfOAaFh 05KKMkYKGeUSab84OGmNz3MecGZZa91Z X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:69bc:7451:58ad:6585]) (user=irogers job=sendgmr) by 2002:a25:afcf:: with SMTP id d15mr13161012ybj.433.1634318505185; Fri, 15 Oct 2021 10:21:45 -0700 (PDT) Date: Fri, 15 Oct 2021 10:21:14 -0700 In-Reply-To: <20211015172132.1162559-1-irogers@google.com> Message-Id: <20211015172132.1162559-4-irogers@google.com> Mime-Version: 1.0 References: <20211015172132.1162559-1-irogers@google.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog Subject: [PATCH v2 03/21] perf pmu: Make pmu_sys_event_tables const. From: Ian Rogers To: Andi Kleen , Jiri Olsa , Jin Yao , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , Arnaldo Carvalho de Melo , Riccardo Mancini , Kan Liang , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Kees Cook , Sami Tolvanen , Nick Desaulniers , Andrew Morton , Jacob Keller , Zhen Lei , ToastC , Joakim Zhang , Felix Fietkau , Jiapeng Chong , Song Liu , Fabian Hemmer , Alexander Antonov , Nicholas Fraser , Adrian Hunter , Denys Zagorui , Wan Jiabing , Thomas Richter , Sumanth Korikkar , Heiko Carstens , Changbin Du , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Andrew Kilroy Cc: Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make lookup nature of data structures clearer through their type. Acked-by: Andi Kleen Signed-off-by: Ian Rogers --- tools/perf/pmu-events/jevents.c | 2 +- tools/perf/pmu-events/pmu-events.h | 2 +- tools/perf/tests/pmu-events.c | 2 +- tools/perf/util/pmu.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c index 5624a37d6f93..a31de0f77097 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c @@ -832,7 +832,7 @@ static void print_mapping_test_table(FILE *outfp) static void print_system_event_mapping_table_prefix(FILE *outfp) { - fprintf(outfp, "\nstruct pmu_sys_events pmu_sys_event_tables[] = {"); + fprintf(outfp, "\nconst struct pmu_sys_events pmu_sys_event_tables[] = {"); } static void print_system_event_mapping_table_suffix(FILE *outfp) diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu-events.h index 42c6db6bedec..f6c9c9fc4ab2 100644 --- a/tools/perf/pmu-events/pmu-events.h +++ b/tools/perf/pmu-events/pmu-events.h @@ -54,6 +54,6 @@ struct pmu_sys_events { * table of PMU events. */ extern const struct pmu_events_map pmu_events_map[]; -extern struct pmu_sys_events pmu_sys_event_tables[]; +extern const struct pmu_sys_events pmu_sys_event_tables[]; #endif diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index 8a1fdcd072f5..c0f8b61871c8 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -258,7 +258,7 @@ static const struct pmu_events_map *__test_pmu_get_events_map(void) static struct pmu_event *__test_pmu_get_sys_events_table(void) { - struct pmu_sys_events *tables = &pmu_sys_event_tables[0]; + const struct pmu_sys_events *tables = &pmu_sys_event_tables[0]; for ( ; tables->name; tables++) { if (!strcmp("pme_test_soc_sys", tables->name)) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 4bcdc595ce5e..c04a89cc7cef 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -873,7 +873,7 @@ void pmu_for_each_sys_event(pmu_sys_event_iter_fn fn, void *data) int i = 0; while (1) { - struct pmu_sys_events *event_table; + const struct pmu_sys_events *event_table; int j = 0; event_table = &pmu_sys_event_tables[i++]; -- 2.33.0.1079.g6e70778dc9-goog