diff options
| author | Ian Rogers <irogers@google.com> | 2026-05-21 08:35:58 -0700 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2026-05-21 13:38:50 -0300 |
| commit | f8d0db39bcc536ef652968c45ca23f8f27f58997 (patch) | |
| tree | f5cac1ec472ae8606c1ce147bef8f967a7d4ccc1 | |
| parent | 85cc481af5ffa23809b7bb100aa774172369983c (diff) | |
perf build: Fix fsmount.o build
A merge conflict between:
commit 552636b9317c8a84 ("perf trace: Add beautifier script for fsmount flags")
commit 32969ef6e3e1979a ("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 <irogers@google.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
| -rw-r--r-- | tools/perf/trace/beauty/Build | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/perf/trace/beauty/Build b/tools/perf/trace/beauty/Build index 93cde93461a3..996e63cdf765 100644 --- a/tools/perf/trace/beauty/Build +++ b/tools/perf/trace/beauty/Build @@ -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) |