[tip:perf/urgent] perf python scripting: Support fedora 11 (audit 1.7.17)

tip-bot for Arnaldo Carvalho de Melo
2010-10-26T10:24:15Z

Commit-ID: 7f6c1bd50d73d12f8b4ea09edb4515997f6527f5
Gitweb: http://git.kernel.org/tip/7f6c1bd50d73d12f8b4ea09edb4515997f6527f5
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Mon, 25 Oct 2010 22:12:01 -0200
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 25 Oct 2010 22:12:01 -0200

perf python scripting: Support fedora 11 (audit 1.7.17)

Where we don't have the audit.MACH_ARMEB constant.

Cc: David S. Miller <davem@davemloft.net>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
.../python/Perf-Trace-Util/lib/Perf/Trace/Util.py | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py
index 9d15f48..99ff1b7 100644
--- a/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py
+++ b/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py
@@ -36,7 +36,6 @@ try:
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 @@ try:
'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]]