summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2014-05-28 18:29:23 +0100
committerWill Deacon <will.deacon@arm.com>2014-05-28 18:29:23 +0100
commit2eb8b396dc6ecf797925cc6bad4c0c6dfbdf4d44 (patch)
treede062b67715e1eb0321032ad2a87f12cb664643b /scripts
parentaf885f4022622331f17227dfcfbb2dafdee25a43 (diff)
parenteed542d6962ba33a689b4007a389f466e407bd74 (diff)
Merge branch 'ftrace/arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into for-next/core
Core ftrace changes from Steve Rostedt, required by the arm64 support code.
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 */