diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-07-12 06:34:42 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-07-12 06:34:42 -0400 |
commit | f2006e27396f55276f24434f56e208d86e7f9908 (patch) | |
tree | 71896db916d33888b4286f80117d3cac0da40e6d /scripts/sortextable.c | |
parent | e399eb56a6110e13f97e644658648602e2b08de7 (diff) | |
parent | 9903883f1dd6e86f286b7bfa6e4b423f98c1cd9e (diff) |
Merge branch 'linus' into timers/urgent
Get upstream changes so we can apply fixes against them
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'scripts/sortextable.c')
-rw-r--r-- | scripts/sortextable.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/sortextable.c b/scripts/sortextable.c index 1f10e89d15b4..f9ce1160419b 100644 --- a/scripts/sortextable.c +++ b/scripts/sortextable.c | |||
@@ -31,6 +31,10 @@ | |||
31 | #include <tools/be_byteshift.h> | 31 | #include <tools/be_byteshift.h> |
32 | #include <tools/le_byteshift.h> | 32 | #include <tools/le_byteshift.h> |
33 | 33 | ||
34 | #ifndef EM_AARCH64 | ||
35 | #define EM_AARCH64 183 | ||
36 | #endif | ||
37 | |||
34 | static int fd_map; /* File descriptor for file being modified. */ | 38 | static int fd_map; /* File descriptor for file being modified. */ |
35 | static int mmap_failed; /* Boolean flag. */ | 39 | static int mmap_failed; /* Boolean flag. */ |
36 | static void *ehdr_curr; /* current ElfXX_Ehdr * for resource cleanup */ | 40 | static void *ehdr_curr; /* current ElfXX_Ehdr * for resource cleanup */ |
@@ -249,6 +253,7 @@ do_file(char const *const fname) | |||
249 | custom_sort = sort_relative_table; | 253 | custom_sort = sort_relative_table; |
250 | break; | 254 | break; |
251 | case EM_ARM: | 255 | case EM_ARM: |
256 | case EM_AARCH64: | ||
252 | case EM_MIPS: | 257 | case EM_MIPS: |
253 | break; | 258 | break; |
254 | } /* end switch */ | 259 | } /* end switch */ |