aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-05-07 13:39:22 +0200
committerIngo Molnar <mingo@kernel.org>2014-05-07 13:39:22 +0200
commit37b16beaa92860c378273ccdcc2ccb22c6cee047 (patch)
tree4fc7f879c32d11d318f411dbe128d080ed8478f9 /scripts
parentMerge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentperf/x86/intel: Fix Silvermont's event constraints (diff)
downloadlinux-37b16beaa92860c378273ccdcc2ccb22c6cee047.tar.gz
linux-37b16beaa92860c378273ccdcc2ccb22c6cee047.zip
Merge branch 'perf/urgent' into perf/core, to avoid conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/sortextable.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/sortextable.c b/scripts/sortextable.c
index cc49062acdee..1052d4834a44 100644
--- a/scripts/sortextable.c
+++ b/scripts/sortextable.c
@@ -35,6 +35,10 @@
#define EM_ARCOMPACT 93
#endif
+#ifndef EM_XTENSA
+#define EM_XTENSA 94
+#endif
+
#ifndef EM_AARCH64
#define EM_AARCH64 183
#endif
@@ -281,6 +285,7 @@ do_file(char const *const fname)
case EM_AARCH64:
case EM_MICROBLAZE:
case EM_MIPS:
+ case EM_XTENSA:
break;
} /* end switch */