[tip:perf/core] perf tools: Consolidate types.h for ARM and ARM64

From: tip-bot for Jean Pihet
Date: Wed May 21 2014 - 01:55:35 EST


Commit-ID: 21a8b756b84ecaa0b7f29199669c151e2ce5e723
Gitweb: http://git.kernel.org/tip/21a8b756b84ecaa0b7f29199669c151e2ce5e723
Author: Jean Pihet <jean.pihet@xxxxxxxxxx>
AuthorDate: Fri, 16 May 2014 10:41:09 +0200
Committer: Jiri Olsa <jolsa@xxxxxxxxxx>
CommitDate: Fri, 16 May 2014 11:38:57 +0200

perf tools: Consolidate types.h for ARM and ARM64

Prevents a build breakage since commit d944c4eebcf4c0d5e5d9728fec110cbf0047ad7f
'tools: Consolidate types.h'

Signed-off-by: Jean Pihet <jean.pihet@xxxxxxxxxx>
Link: http://lkml.kernel.org/r/1400229672-16104-1-git-send-email-jean.pihet@xxxxxxxxxx
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
---
tools/perf/arch/arm/include/perf_regs.h | 2 +-
tools/perf/arch/arm64/include/perf_regs.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/arch/arm/include/perf_regs.h b/tools/perf/arch/arm/include/perf_regs.h
index 2a1cfde..bcca511 100644
--- a/tools/perf/arch/arm/include/perf_regs.h
+++ b/tools/perf/arch/arm/include/perf_regs.h
@@ -2,7 +2,7 @@
#define ARCH_PERF_REGS_H

#include <stdlib.h>
-#include "../../util/types.h"
+#include <linux/types.h>
#include <asm/perf_regs.h>

#define PERF_REGS_MASK ((1ULL << PERF_REG_ARM_MAX) - 1)
diff --git a/tools/perf/arch/arm64/include/perf_regs.h b/tools/perf/arch/arm64/include/perf_regs.h
index 2359546..e9441b9 100644
--- a/tools/perf/arch/arm64/include/perf_regs.h
+++ b/tools/perf/arch/arm64/include/perf_regs.h
@@ -2,7 +2,7 @@
#define ARCH_PERF_REGS_H

#include <stdlib.h>
-#include "../../util/types.h"
+#include <linux/types.h>
#include <asm/perf_regs.h>

#define PERF_REGS_MASK ((1ULL << PERF_REG_ARM64_MAX) - 1)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/