diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-12-18 21:37:07 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-12-18 21:37:07 -0300 |
| commit | ab1c247094e323177a578b38f0325bf79f0317ac (patch) | |
| tree | 97ff10609587158d6f726f5d1b118b13339501d9 /tools/perf/util/Build | |
| parent | 71225af17f611632226a4a2fae25235fd8dad268 (diff) | |
| parent | 2cf4f94d8e8646803f8fb0facf134b0cd7fb691a (diff) | |
| download | linux-ab1c247094e323177a578b38f0325bf79f0317ac.tar.gz linux-ab1c247094e323177a578b38f0325bf79f0317ac.tar.bz2 linux-ab1c247094e323177a578b38f0325bf79f0317ac.zip | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick up fixes that went thru perf-tools for v6.7 and to get in sync
with upstream to check for drift in the copies of headers, etc.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/Build')
| -rw-r--r-- | tools/perf/util/Build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 73e3f194f949..132508ebe125 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -348,7 +348,7 @@ CFLAGS_rbtree.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ET CFLAGS_libstring.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" CFLAGS_hweight.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" CFLAGS_header.o += -include $(OUTPUT)PERF-VERSION-FILE -CFLAGS_arm-spe.o += -I$(srctree)/tools/arch/arm64/include/ +CFLAGS_arm-spe.o += -I$(srctree)/tools/arch/arm64/include/ -I$(OUTPUT)arch/arm64/include/generated/ $(OUTPUT)util/argv_split.o: ../lib/argv_split.c FORCE $(call rule_mkdir) |