diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-06-22 13:56:50 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-06-22 13:56:50 -0300 |
commit | ce09673636f9581d2e2e24af785c463c030a1fd8 (patch) | |
tree | 5d696220bd70dcad7cc0809cf6e3225b4953bf05 /tools/perf/Makefile.config | |
parent | 45237f9898fce54a8cc6d40f7455291e0e6c4277 (diff) | |
parent | a96bfed64c8986d6404e553f18203cae1f5ac7e6 (diff) | |
download | linux-ce09673636f9581d2e2e24af785c463c030a1fd8.tar.bz2 |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes, since perf/urgent is already upstream.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/Makefile.config')
-rw-r--r-- | tools/perf/Makefile.config | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index a62d09808fef..8dc7cef684dc 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -90,7 +90,6 @@ endif ifeq ($(ARCH),mips) NO_PERF_REGS := 0 CFLAGS += -I$(OUTPUT)arch/mips/include/generated - CFLAGS += -I../../arch/mips/include/uapi -I../../arch/mips/include/generated/uapi LIBUNWIND_LIBS = -lunwind -lunwind-mips endif |