Merge branch 'next' into for-linus

Merge first round of changes for 3.13 merge window.

1 files changed, 5 insertions, 8 deletions

diff --git a/scripts/sortextable.c b/scripts/sortextable.c
index 1f10e89d15b4..7c2310c5b996 100644
--- a/scripts/sortextable.c
+++ b/scripts/sortextable.c
@@ -31,6 +31,10 @@
 #include <tools/be_byteshift.h>
 #include <tools/le_byteshift.h>
 
+#ifndef EM_AARCH64
+#define EM_AARCH64      183
+#endif
+
 static int fd_map;      /* File descriptor for file being modified. */
 static int mmap_failed; /* Boolean flag. */
 static void *ehdr_curr; /* current ElfXX_Ehdr *  for resource cleanup */
@@ -60,14 +64,6 @@ fail_file(void)
         longjmp(jmpenv, SJ_FAIL);
 }
 
-static void __attribute__((noreturn))
-succeed_file(void)
-{
-        cleanup();
-        longjmp(jmpenv, SJ_SUCCEED);
-}
-
-
 /*
  * Get the whole file as a programming convenience in order to avoid
  * malloc+lseek+read+free of many pieces.  If successful, then mmap
@@ -249,6 +245,7 @@ do_file(char const *const fname)
                 custom_sort = sort_relative_table;
                 break;
         case EM_ARM:
+        case EM_AARCH64:
         case EM_MIPS:
                 break;
         }  /* end switch */