From 15418fea18fa929dcf21815e47f8ea0eb05eaedf Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Mon, 25 Oct 2010 22:12:01 -0200
Subject: [PATCH] --- yaml --- r: 218672 b: refs/heads/master c:
 7f6c1bd50d73d12f8b4ea09edb4515997f6527f5 h: refs/heads/master v: v3

---
 [refs]                                                       | 2 +-
 .../scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 72d10e65cd6a..dfdc1e8ccfde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a64fa198ba1cd232871710c37476e006ed5516ed
+refs/heads/master: 7f6c1bd50d73d12f8b4ea09edb4515997f6527f5
diff --git a/trunk/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py b/trunk/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py
index 9d15f484308c..99ff1b7a0d2c 100644
--- a/trunk/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py
+++ b/trunk/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py
@@ -36,7 +36,6 @@ def clear_term():
 	machine_to_id = {
 		'x86_64': audit.MACH_86_64,
 		'alpha'	: audit.MACH_ALPHA,
-		'armeb'	: audit.MACH_ARMEB,
 		'ia64'	: audit.MACH_IA64,
 		'ppc'	: audit.MACH_PPC,
 		'ppc64'	: audit.MACH_PPC64,
@@ -46,6 +45,10 @@ def clear_term():
 		'i586'	: audit.MACH_X86,
 		'i686'	: audit.MACH_X86,
 	}
+	try:
+		machine_to_id['armeb'] = audit.MACH_ARMEB
+	except:
+		pass
 	machine_id = machine_to_id[os.uname()[4]]
 except:
 	if not audit_package_warned: