Re: [PATCH] perf libdw: Fix off-by 1 relative directory includes

[Ian Rogers]

On Sun, May 31, 2020 at 7:29 AM Namhyung Kim <namhyung@xxxxxxxxxx> wrote:
>
> Hi Ian,
>
> On Sat, May 30, 2020 at 7:53 AM Ian Rogers <irogers@xxxxxxxxxx> wrote:
> >
> > This is currently working due to extra include paths in the build.
> >
> > Before:
> > $ cd tools/perf/arch/arm64/util
> > $ ls -la ../../util/unwind-libdw.h
> > ls: cannot access '../../util/unwind-libdw.h': No such file or directory
> >
> > After:
> > $ ls -la ../../../util/unwind-libdw.h
> > -rw-r----- 1 irogers irogers 553 Apr 17 14:31 ../../../util/unwind-libdw.h
>
> Missing sign-off, but otherwise looks good to me

Doh! Thanks Namhyung.

Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>

Ian

> Acked-by: Namhyung Kim <namhyung@xxxxxxxxxx>
>
> Thanks
> Namhyung
>
>
> > ---
> >  tools/perf/arch/arm64/util/unwind-libdw.c   | 6 +++---
> >  tools/perf/arch/powerpc/util/unwind-libdw.c | 6 +++---
> >  tools/perf/arch/x86/util/unwind-libdw.c     | 6 +++---
> >  3 files changed, 9 insertions(+), 9 deletions(-)
> >
> > diff --git a/tools/perf/arch/arm64/util/unwind-libdw.c b/tools/perf/arch/arm64/util/unwind-libdw.c
> > index 7623d85e77f3..a50941629649 100644
> > --- a/tools/perf/arch/arm64/util/unwind-libdw.c
> > +++ b/tools/perf/arch/arm64/util/unwind-libdw.c
> > @@ -1,8 +1,8 @@
> >  // SPDX-License-Identifier: GPL-2.0
> >  #include <elfutils/libdwfl.h>
> > -#include "../../util/unwind-libdw.h"
> > -#include "../../util/perf_regs.h"
> > -#include "../../util/event.h"
> > +#include "../../../util/unwind-libdw.h"
> > +#include "../../../util/perf_regs.h"
> > +#include "../../../util/event.h"
> >
> >  bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg)
> >  {
> > diff --git a/tools/perf/arch/powerpc/util/unwind-libdw.c b/tools/perf/arch/powerpc/util/unwind-libdw.c
> > index abf2dbc7f829..7b2d96ec28e3 100644
> > --- a/tools/perf/arch/powerpc/util/unwind-libdw.c
> > +++ b/tools/perf/arch/powerpc/util/unwind-libdw.c
> > @@ -1,9 +1,9 @@
> >  // SPDX-License-Identifier: GPL-2.0
> >  #include <elfutils/libdwfl.h>
> >  #include <linux/kernel.h>
> > -#include "../../util/unwind-libdw.h"
> > -#include "../../util/perf_regs.h"
> > -#include "../../util/event.h"
> > +#include "../../../util/unwind-libdw.h"
> > +#include "../../../util/perf_regs.h"
> > +#include "../../../util/event.h"
> >
> >  /* See backends/ppc_initreg.c and backends/ppc_regs.c in elfutils.  */
> >  static const int special_regs[3][2] = {
> > diff --git a/tools/perf/arch/x86/util/unwind-libdw.c b/tools/perf/arch/x86/util/unwind-libdw.c
> > index fda8f4206ee4..eea2bf87232b 100644
> > --- a/tools/perf/arch/x86/util/unwind-libdw.c
> > +++ b/tools/perf/arch/x86/util/unwind-libdw.c
> > @@ -1,8 +1,8 @@
> >  // SPDX-License-Identifier: GPL-2.0
> >  #include <elfutils/libdwfl.h>
> > -#include "../../util/unwind-libdw.h"
> > -#include "../../util/perf_regs.h"
> > -#include "../../util/event.h"
> > +#include "../../../util/unwind-libdw.h"
> > +#include "../../../util/perf_regs.h"
> > +#include "../../../util/event.h"
> >
> >  bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg)
> >  {
> > --
> > 2.27.0.rc2.251.g90737beb825-goog
> >