perf tools: Remove superfluous ARCH Makefile includes

tip:perf/core tip-bot for Jiri Olsa 1 participant 1 message Apr 13, 2016 perf events

Share & tools

tip-bot for Jiri Olsa

author merge bot

2016-04-13 07:14 UTC #0 lore raw

Commit-ID:  860b69f1d533de39fa70784768008d0eaf242e5c
Gitweb:     http://git.kernel.org/tip/860b69f1d533de39fa70784768008d0eaf242e5c
Author:     Jiri Olsa <[email protected]>
AuthorDate: Tue, 5 Apr 2016 17:01:52 +0200
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 6 Apr 2016 11:00:01 -0300

perf tools: Remove superfluous ARCH Makefile includes

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Jiri Olsa <[email protected]>

---
 tools/perf/Makefile.perf   | 2 --
 tools/perf/config/Makefile | 3 ---
 2 files changed, 5 deletions(-)

tools/perf/Makefile.perf +0 -2

index 000ea21..58aed81 100644
@@ -297,8 +297,6 @@ endif
 # because maintaining the nesting to match is a pain.  If
 # we had "elif" things would have been much nicer...
 
--include arch/$(ARCH)/Makefile
-
 ifneq ($(OUTPUT),)
   CFLAGS += -I$(OUTPUT)
 endif

tools/perf/config/Makefile +0 -3

index 6f8f643..d1e2b85 100644
@@ -295,9 +295,6 @@ ifndef NO_LIBELF
     CFLAGS += -DHAVE_ELF_GETPHDRNUM_SUPPORT
   endif
 
-  # include ARCH specific config
-  -include $(src-perf)/arch/$(ARCH)/Makefile
-
   ifndef NO_DWARF
     ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined)
       msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled);