linux-next: build failure after merge of the perf tree

[Stephen Rothwell]

Hi all,

After merging the perf tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from include/linux/perf_event.h:17,
                 from arch/powerpc/perf/isa207-common.h:12,
                 from arch/powerpc/perf/isa207-common.c:9:
arch/powerpc/perf/isa207-common.c: In function 'isa207_find_source':
include/uapi/linux/perf_event.h:1339:11: error: 'PERF_MEM_HOPS_2' undeclared (first use in this function); did you mean 'PERF_MEM_HOPS_0'?
 1339 |  (((__u64)PERF_MEM_##a##_##s) << PERF_MEM_##a##_SHIFT)
      |           ^~~~~~~~~
arch/powerpc/perf/isa207-common.h:273:20: note: in expansion of macro 'PERF_MEM_S'
  273 | #define P(a, b)    PERF_MEM_S(a, b)
      |                    ^~~~~~~~~~
arch/powerpc/perf/isa207-common.c:240:51: note: in expansion of macro 'P'
  240 |     ret |= PH(LVL, REM_RAM1) | REM | LEVEL(RAM) | P(HOPS, 2);
      |                                                   ^
include/uapi/linux/perf_event.h:1339:11: note: each undeclared identifier is reported only once for each function it appears in
 1339 |  (((__u64)PERF_MEM_##a##_##s) << PERF_MEM_##a##_SHIFT)
      |           ^~~~~~~~~
arch/powerpc/perf/isa207-common.h:273:20: note: in expansion of macro 'PERF_MEM_S'
  273 | #define P(a, b)    PERF_MEM_S(a, b)
      |                    ^~~~~~~~~~
arch/powerpc/perf/isa207-common.c:240:51: note: in expansion of macro 'P'
  240 |     ret |= PH(LVL, REM_RAM1) | REM | LEVEL(RAM) | P(HOPS, 2);
      |                                                   ^
include/uapi/linux/perf_event.h:1339:11: error: 'PERF_MEM_HOPS_3' undeclared (first use in this function); did you mean 'PERF_MEM_HOPS_0'?
 1339 |  (((__u64)PERF_MEM_##a##_##s) << PERF_MEM_##a##_SHIFT)
      |           ^~~~~~~~~
arch/powerpc/perf/isa207-common.h:273:20: note: in expansion of macro 'PERF_MEM_S'
  273 | #define P(a, b)    PERF_MEM_S(a, b)
      |                    ^~~~~~~~~~
arch/powerpc/perf/isa207-common.c:244:51: note: in expansion of macro 'P'
  244 |     ret |= PH(LVL, REM_RAM2) | REM | LEVEL(RAM) | P(HOPS, 3);
      |                                                   ^

Caused by commit

  af2b24f228a0 ("perf powerpc: Add data source encodings for power10 platform")

It looks like patch 1/4 of this series is missing ...

I have used the perf tree from next-20220105 for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgp8yiQm0KVGC.pgp
Description: OpenPGP digital signature