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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <tip-7f6c1bd50d73d12f8b4ea09edb4515997f6527f5@git.kernel.org>
Date:	Tue, 26 Oct 2010 10:23:41 GMT
From:	tip-bot for Arnaldo Carvalho de Melo <acme@...hat.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, eranian@...gle.com, paulus@...ba.org,
	acme@...hat.com, hpa@...or.com, mingo@...hat.com,
	tzanussi@...il.com, peterz@...radead.org, efault@....de,
	davem@...emloft.net, fweisbec@...il.com, tglx@...utronix.de,
	mingo@...e.hu
Subject: [tip:perf/urgent] perf python scripting: Support fedora 11 (audit 1.7.17)

Commit-ID:  7f6c1bd50d73d12f8b4ea09edb4515997f6527f5
Gitweb:     http://git.kernel.org/tip/7f6c1bd50d73d12f8b4ea09edb4515997f6527f5
Author:     Arnaldo Carvalho de Melo <acme@...hat.com>
AuthorDate: Mon, 25 Oct 2010 22:12:01 -0200
Committer:  Arnaldo Carvalho de Melo <acme@...hat.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@...emloft.net>
Cc: Frederic Weisbecker <fweisbec@...il.com>
Cc: Ingo Molnar <mingo@...e.hu>
Cc: Mike Galbraith <efault@....de>
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Stephane Eranian <eranian@...gle.com>
Cc: Tom Zanussi <tzanussi@...il.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.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]]
 except:
 	if not audit_package_warned:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/