perf libdw: Fix off-by 1 relative directory includes
Subsystems (2)
Ian Rogers
reviewerPATCH 1/1 perf libdw: Fix off-by 1 relative directory includes
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 --- 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(-)
tools/perf/arch/arm64/util/unwind-libdw.c +3 -3
@@ -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) {
tools/perf/arch/powerpc/util/unwind-libdw.c +3 -3
@@ -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 ] = {
tools/perf/arch/x86/util/unwind-libdw.c +3 -3
@@ -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) {
Signature · 1 line
2.27.0.rc2.251.g90737beb825-goog
Hi Ian,
Quoted 11 lines · Ian Rogers
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 directoryAfter:
$ 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
Thanks
Namhyung
Quoted 58 lines
--- 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(-)tools/perf/arch/arm64/util/unwind-libdw.c +3
-3@@ -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) {tools/perf/arch/powerpc/util/unwind-libdw.c +3
-3@@ -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 ] = {tools/perf/arch/x86/util/unwind-libdw.c +3
-4@@ -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
Ian Rogers
reviewerQuoted 12 lines · Namhyung Kim
Hi Ian,
Quoted 8 lines · Ian Rogers
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
Quoted 5 lines
Quoted 3 lines
After:
$ ls -la ../../../util/unwind-libdw.h -rw-r----- 1 irogers irogers 553 Apr 17 14:31 ../../../util/unwind-libdw.hMissing sign-off, but otherwise looks good to me
Doh! Thanks Namhyung.
Ian
Quoted 64 lines
Acked-by Namhyung Kim <[email protected]>Thanks
NamhyungQuoted 58 lines
--- 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(-)tools/perf/arch/arm64/util/unwind-libdw.c +3
-3@@ -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) {tools/perf/arch/powerpc/util/unwind-libdw.c +3
-3@@ -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 ] = {tools/perf/arch/x86/util/unwind-libdw.c +3
-4@@ -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
Em Sun, May 31, 2020 at 05:06:08PM -0700, Ian Rogers escreveu:
Quoted 17 lines · Namhyung Kim
Quoted 16 lines
Hi Ian,
Quoted 11 lines · Ian Rogers
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 directoryAfter:
$ ls -la ../../../util/unwind-libdw.h -rw-r----- 1 irogers irogers 553 Apr 17 14:31 ../../../util/unwind-libdw.h
Quoted 5 lines
Quoted 1 line
Missing sign-off, but otherwise looks good to me
Doh! Thanks Namhyung.
Signed-off-by Ian Rogers <[email protected]>
Thanks, applied.
- Arnaldo
Quoted 66 lines
Ian
Quoted 64 lines
Acked-by Namhyung Kim <[email protected]>Thanks
NamhyungQuoted 58 lines
--- 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(-)tools/perf/arch/arm64/util/unwind-libdw.c +3
-3@@ -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) {tools/perf/arch/powerpc/util/unwind-libdw.c +3
-3@@ -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 ] = {tools/perf/arch/x86/util/unwind-libdw.c +3
-4@@ -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
Signature · 1 line
- Arnaldo