From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Yanteng Si <siyanteng@loongson.cn>
Cc: peterz@infradead.org, mingo@redhat.com, mark.rutland@arm.com,
alexander.shishkin@linux.intel.com, jolsa@kernel.org,
namhyung@kernel.org, irogers@google.com, adrian.hunter@intel.com,
linux-perf-users@vger.kernel.org,
loongson-kernel@lists.loongnix.cn
Subject: Re: [PATCH v2 07/17] tools headers UAPI: Sync the linux/perf_event.h with the kernel headers
Date: Wed, 10 May 2023 12:44:49 -0300 [thread overview]
Message-ID: <ZFu78esjBo+hNVhh@kernel.org> (raw)
In-Reply-To: <20ca606cfaea0631c06060fe04270bb08a6a067f.1683712945.git.siyanteng@loongson.cn>
Em Wed, May 10, 2023 at 06:22:52PM +0800, Yanteng Si escreveu:
> Picking the changes from:
>
> commit 09519ec3b19e4144 ("perf: Add perf_event_attr::config3")
> commit cb6c18b5a41622c7 ("perf/mem: Rename PERF_MEM_LVLNUM_EXTN_MEM to
> PERF_MEM_LVLNUM_CXL")
>
> Silencing these perf build warnings::
>
> Warning: Kernel ABI header at 'tools/include/uapi/linux/perf_event.h'
> differs from latest version at 'include/uapi/linux/perf_event.h'
> diff -u tools/include/uapi/linux/perf_event.h include/uapi/linux
> /perf_event.h
Dropping this one as well:
CC /tmp/build/perf-tools/util/unwind-libunwind-local.o
CC /tmp/build/perf-tools/util/unwind-libunwind.o
CC /tmp/build/perf-tools/util/data-convert-bt.o
util/mem-events.c:298:10: error: ‘PERF_MEM_LVLNUM_UNC’ undeclared here (not in a function); did you mean ‘PERF_MEM_LVLNUM_NA’?
298 | [PERF_MEM_LVLNUM_UNC] = "Uncached",
| ^~~~~~~~~~~~~~~~~~~
| PERF_MEM_LVLNUM_NA
util/mem-events.c:298:10: error: array index in initializer not of integer type
util/mem-events.c:298:10: note: (near initialization for ‘mem_lvlnum’)
make[4]: *** [/var/home/acme/git/perf-tools/tools/build/Makefile.build:98: /tmp/build/perf-tools/util/mem-events.o] Error 1
make[4]: *** Waiting for unfinished jobs....
LD /tmp/build/perf-tools/util/cs-etm-decoder/perf-in.o
> Signed-off-by: Yanteng Si <siyanteng@loongson.cn>
> ---
> tools/include/uapi/linux/perf_event.h | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h
> index 39c6a250dd1b..37675437b768 100644
> --- a/tools/include/uapi/linux/perf_event.h
> +++ b/tools/include/uapi/linux/perf_event.h
> @@ -1339,8 +1339,7 @@ union perf_mem_data_src {
> #define PERF_MEM_LVLNUM_L2 0x02 /* L2 */
> #define PERF_MEM_LVLNUM_L3 0x03 /* L3 */
> #define PERF_MEM_LVLNUM_L4 0x04 /* L4 */
> -/* 5-0x7 available */
> -#define PERF_MEM_LVLNUM_UNC 0x08 /* Uncached */
> +/* 5-0x8 available */
> #define PERF_MEM_LVLNUM_CXL 0x09 /* CXL */
> #define PERF_MEM_LVLNUM_IO 0x0a /* I/O */
> #define PERF_MEM_LVLNUM_ANY_CACHE 0x0b /* Any cache */
> --
> 2.31.4
>
--
- Arnaldo
next prev parent reply other threads:[~2023-05-10 15:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-10 10:21 [PATCH v2 00/17] tools perf: fix build warnings Yanteng Si
2023-05-10 10:21 ` [PATCH v2 01/17] tools headers UAPI: Sync the linux/in.h with the kernel sources Yanteng Si
2023-05-10 10:21 ` [PATCH v2 02/17] tools headers UAPI: Sync the linux/prctl.h " Yanteng Si
2023-05-10 10:21 ` [PATCH v2 03/17] tools headers UAPI: Sync the drm/drm.h " Yanteng Si
2023-05-10 10:22 ` [PATCH v2 04/17] tools headers UAPI: Sync the i915_drm.h " Yanteng Si
2023-05-10 10:22 ` [PATCH v2 05/17] tools headers UAPI: Sync the coresight-pmu headers copy " Yanteng Si
2023-05-10 15:41 ` Arnaldo Carvalho de Melo
2023-05-22 9:56 ` James Clark
2023-05-10 10:22 ` [PATCH v2 06/17] tools headers UAPI: Sync the linux/const.h with the kernel headers Yanteng Si
2023-05-10 10:22 ` [PATCH v2 07/17] tools headers UAPI: Sync the linux/perf_event.h " Yanteng Si
2023-05-10 15:44 ` Arnaldo Carvalho de Melo [this message]
2023-05-10 10:24 ` [PATCH v2 08/17] tools include UAPI: Sync the sound/asound.h copy with the kernel sources Yanteng Si
2023-05-10 10:24 ` [PATCH v2 09/17] tools headers UAPI: Sync the linux/mman.h " Yanteng Si
2023-05-10 10:24 ` [PATCH v2 10/17] tools headers UAPI: Sync the unistd " Yanteng Si
2023-05-10 10:24 ` [PATCH v2 11/17] tools headers kvm: Sync uapi/{asm/linux} kvm.h headers " Yanteng Si
2023-05-10 10:24 ` [PATCH v2 12/17] tools arch x86: Sync the disabled-features " Yanteng Si
2023-05-10 10:24 ` [PATCH v2 13/17] tools arch x86: Sync the memcpy_64 " Yanteng Si
2023-05-10 15:48 ` Arnaldo Carvalho de Melo
2023-05-10 10:24 ` [PATCH v2 14/17] tools arch x86: Sync the cpufeatures " Yanteng Si
2023-05-10 10:24 ` [PATCH v2 15/17] tools arch x86: Sync the msr-index.h copy " Yanteng Si
2023-05-10 10:25 ` [PATCH v2 16/17] tools arch x86: Sync the prctl headers " Yanteng Si
2023-05-10 10:25 ` [PATCH v2 17/17] tools arch arm64: Sync the perf_regs " Yanteng Si
2023-05-10 15:26 ` Arnaldo Carvalho de Melo
2023-05-15 4:08 ` Leo Yan
2023-05-20 3:11 ` Leo Yan
2023-05-10 17:06 ` [PATCH v2 00/17] tools perf: fix build warnings Arnaldo Carvalho de Melo
2023-05-15 11:08 ` Yanteng Si
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZFu78esjBo+hNVhh@kernel.org \
--to=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=loongson-kernel@lists.loongnix.cn \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=siyanteng@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).