From 86b67fbfd707284645ad0e42bf97fe0038f9c91b Mon Sep 17 00:00:00 2001
From: David Ahern <dsahern@gmail.com>
Date: Mon, 27 Aug 2012 13:05:54 -0600
Subject: [PATCH] --- yaml --- r: 323755 b: refs/heads/master c:
 09a2f16a916178489fc4bf439de668d81fda7616 h: refs/heads/master i:   323753:
 543904eb6bdd8f40fc5d1774728305f25214c3f3   323751:
 1718fa1f1794b461902187705f3411c51677aac3 v: v3

---
 [refs]                    | 2 +-
 trunk/tools/perf/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 62aadcc18020..ca381648e1f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d3eca20b9f31cf10088e283d704f6a71b9a4ee2
+refs/heads/master: 09a2f16a916178489fc4bf439de668d81fda7616
diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile
index 722ddee61f9f..939cf6d898a5 100644
--- a/trunk/tools/perf/Makefile
+++ b/trunk/tools/perf/Makefile
@@ -64,12 +64,12 @@ AR = $(CROSS_COMPILE)ar
 
 # Additional ARCH settings for x86
 ifeq ($(ARCH),i386)
-	ARCH := x86
+	override ARCH := x86
 	NO_PERF_REGS := 0
 	LIBUNWIND_LIBS = -lunwind -lunwind-x86
 endif
 ifeq ($(ARCH),x86_64)
-	ARCH := x86
+	override ARCH := x86
 	IS_X86_64 := 0
 	ifeq (, $(findstring m32,$(EXTRA_CFLAGS)))
 		IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1)