perf tools: Do not ignore the default vmlinux.h

Message ID 20231010234247.71604-1-namhyung@kernel.org
State New
Headers
Series perf tools: Do not ignore the default vmlinux.h |

Commit Message

Namhyung Kim Oct. 10, 2023, 11:42 p.m. UTC
  The recent change made it possible to generate vmlinux.h from BTF and
to ignore the file.  But we also have a minimal vmlinux.h that will be
used by default.  It should not be ignored by GIT.

Fixes: b7a2d774c9c5 ("perf build: Add ability to build with a generated vmlinux.h")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202310110451.rvdUZJEY-lkp@intel.com/
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/util/bpf_skel/vmlinux/.gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 tools/perf/util/bpf_skel/vmlinux/.gitignore
  

Comments

Ian Rogers Oct. 11, 2023, 1:35 a.m. UTC | #1
On Tue, Oct 10, 2023 at 4:42 PM Namhyung Kim <namhyung@kernel.org> wrote:
>
> The recent change made it possible to generate vmlinux.h from BTF and
> to ignore the file.  But we also have a minimal vmlinux.h that will be
> used by default.  It should not be ignored by GIT.
>
> Fixes: b7a2d774c9c5 ("perf build: Add ability to build with a generated vmlinux.h")
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202310110451.rvdUZJEY-lkp@intel.com/
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>

Reviewed-by: Ian Rogers <irogers@google.com>

Thanks!
Ian

> ---
>  tools/perf/util/bpf_skel/vmlinux/.gitignore | 1 +
>  1 file changed, 1 insertion(+)
>  create mode 100644 tools/perf/util/bpf_skel/vmlinux/.gitignore
>
> diff --git a/tools/perf/util/bpf_skel/vmlinux/.gitignore b/tools/perf/util/bpf_skel/vmlinux/.gitignore
> new file mode 100644
> index 000000000000..49502c04183a
> --- /dev/null
> +++ b/tools/perf/util/bpf_skel/vmlinux/.gitignore
> @@ -0,0 +1 @@
> +!vmlinux.h
> --
> 2.42.0.609.gbb76f46606-goog
>
  
Namhyung Kim Oct. 20, 2023, 5:40 a.m. UTC | #2
On Tue, Oct 10, 2023 at 6:36 PM Ian Rogers <irogers@google.com> wrote:
>
> On Tue, Oct 10, 2023 at 4:42 PM Namhyung Kim <namhyung@kernel.org> wrote:
> >
> > The recent change made it possible to generate vmlinux.h from BTF and
> > to ignore the file.  But we also have a minimal vmlinux.h that will be
> > used by default.  It should not be ignored by GIT.
> >
> > Fixes: b7a2d774c9c5 ("perf build: Add ability to build with a generated vmlinux.h")
> > Reported-by: kernel test robot <lkp@intel.com>
> > Closes: https://lore.kernel.org/oe-kbuild-all/202310110451.rvdUZJEY-lkp@intel.com/
> > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
>
> Reviewed-by: Ian Rogers <irogers@google.com>

Applied to perf-tools-next, thanks!
  

Patch

diff --git a/tools/perf/util/bpf_skel/vmlinux/.gitignore b/tools/perf/util/bpf_skel/vmlinux/.gitignore
new file mode 100644
index 000000000000..49502c04183a
--- /dev/null
+++ b/tools/perf/util/bpf_skel/vmlinux/.gitignore
@@ -0,0 +1 @@ 
+!vmlinux.h