Messages in this thread | | | From | Arnaldo Carvalho de Melo <> | Date | Tue, 30 Jul 2019 19:02:44 -0300 | Subject | Re: [PATCH] perf tools: Fix paths in include statements |
| |
Em Fri, Jul 19, 2019 at 01:22:53PM -0700, Luke Mujica escreveu: > These paths point to the wrong location but still work because > they get picked up by a -I flag that happens to direct to the correct > file. Fix paths to lead to the actual file location without help from > include flags.
Thanks, applied.
- Arnaldo
> Signed-off-by: Luke Mujica <lukemujica@google.com> > --- > tools/perf/arch/x86/util/kvm-stat.c | 4 ++-- > tools/perf/arch/x86/util/tsc.c | 6 +++--- > tools/perf/ui/helpline.c | 4 ++-- > tools/perf/ui/util.c | 2 +- > 4 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/tools/perf/arch/x86/util/kvm-stat.c b/tools/perf/arch/x86/util/kvm-stat.c > index 865a9762f22e..3f84403c0983 100644 > --- a/tools/perf/arch/x86/util/kvm-stat.c > +++ b/tools/perf/arch/x86/util/kvm-stat.c > @@ -1,7 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0 > #include <errno.h> > -#include "../../util/kvm-stat.h" > -#include "../../util/evsel.h" > +#include "../../../util/kvm-stat.h" > +#include "../../../util/evsel.h" > #include <asm/svm.h> > #include <asm/vmx.h> > #include <asm/kvm.h> > diff --git a/tools/perf/arch/x86/util/tsc.c b/tools/perf/arch/x86/util/tsc.c > index 950539f9a4f7..b1eb963b4a6e 100644 > --- a/tools/perf/arch/x86/util/tsc.c > +++ b/tools/perf/arch/x86/util/tsc.c > @@ -5,10 +5,10 @@ > #include <linux/stddef.h> > #include <linux/perf_event.h> > > -#include "../../perf.h" > +#include "../../../perf.h" > #include <linux/types.h> > -#include "../../util/debug.h" > -#include "../../util/tsc.h" > +#include "../../../util/debug.h" > +#include "../../../util/tsc.h" > > int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc, > struct perf_tsc_conversion *tc) > diff --git a/tools/perf/ui/helpline.c b/tools/perf/ui/helpline.c > index b3c421429ed4..54bcd08df87e 100644 > --- a/tools/perf/ui/helpline.c > +++ b/tools/perf/ui/helpline.c > @@ -3,10 +3,10 @@ > #include <stdlib.h> > #include <string.h> > > -#include "../debug.h" > +#include "../util/debug.h" > #include "helpline.h" > #include "ui.h" > -#include "../util.h" > +#include "../util/util.h" > > char ui_helpline__current[512]; > > diff --git a/tools/perf/ui/util.c b/tools/perf/ui/util.c > index 63bf06e80ab9..9ed76e88a3e4 100644 > --- a/tools/perf/ui/util.c > +++ b/tools/perf/ui/util.c > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0 > #include "util.h" > -#include "../debug.h" > +#include "../util/debug.h" > > > /* > -- > 2.22.0.657.g960e92d24f-goog
--
- Arnaldo
| |