imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-10-31 22:34:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

perf build: Fix fsmount.o build

Browse Source 
A merge conflict between:

commit 552636b931 ("perf trace: Add beautifier script for fsmount flags")
commit 32969ef6e3 ("perf build: Pre-generate BPF skeleton tooling during umbrella prepare phase")

Resulted in a missed build dependency in the linux-next merge:

commit 61da860eee0798d3 ("Merge branch 'perf-tools-next' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git")

Fix the build by adding the necessary build dependencies.

Signed-off-by: Ian Rogers <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Namhyung Kim <[email protected]>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
This commit is contained in:
Ian Rogers authored and Arnaldo Carvalho de Melo committed 2026-05-21 13:38:50 -03:00
1 parent 85cc481af5
commit f8d0db39bc
1 file changed
+8 -1
Download Patch File Download Diff File Expand all files Collapse all files
tools/perf/trace/beauty/Build
+8 -1
View File
@@ -111,6 +111,13 @@ $(fsmount_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsmount_tbls)
$(call rule_mkdir)
$(Q)$(call echo-cmd,gen)$(SHELL) '$(fsmount_tbls)' $(beauty_uapi_linux_dir) > $@
fsmount_attr_arrays := $(beauty_outdir)/fsmount_attr_arrays.c
fsmount_attr_tbls := $(srctree)/tools/perf/trace/beauty/fsmount_attr.sh
$(fsmount_attr_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsmount_attr_tbls)
$(call rule_mkdir)
$(Q)$(call echo-cmd,gen)$(SHELL) '$(fsmount_attr_tbls)' $(beauty_uapi_linux_dir) > $@
fspick_arrays := $(beauty_outdir)/fspick_arrays.c
fspick_tbls := $(srctree)/tools/perf/trace/beauty/fspick.sh
@@ -285,7 +292,7 @@ $(OUTPUT)trace/beauty/syscalltbl.o: $(syscall_array)
$(OUTPUT)trace/beauty/fsconfig.o: $(fsconfig_arrays)
$(OUTPUT)trace/beauty/clone.o: $(clone_flags_array)
$(OUTPUT)trace/beauty/fs_at_flags.o: $(fs_at_flags_array)
$(OUTPUT)trace/beauty/fsmount.o: $(fsmount_arrays)
$(OUTPUT)trace/beauty/fsmount.o: $(fsmount_arrays) $(fsmount_attr_arrays)
$(OUTPUT)trace/beauty/fspick.o: $(fspick_arrays)
$(OUTPUT)trace/beauty/ioctl.o: $(drm_ioctl_array) $(sndrv_pcm_ioctl_array) $(sndrv_ctl_ioctl_array) $(kvm_ioctl_array) $(vhost_virtio_ioctl_array) $(perf_ioctl_array) $(usbdevfs_ioctl_array)
$(OUTPUT)trace/beauty/kcmp.o: $(kcmp_type_array)