diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-25 09:59:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-25 09:59:19 +0200 |
| commit | 8d58b66ed2b000f27658c88a4ed70e8042e86a58 (patch) | |
| tree | 5bae2c74f932b5d863f72cb698a6f71260340b26 /arch/alpha/boot/tools/objstrip.c | |
| parent | x86/mm: Make kernel/check.c explicitly non-modular (diff) | |
| parent | Linux 4.2-rc8 (diff) | |
| download | linux-8d58b66ed2b000f27658c88a4ed70e8042e86a58.tar.xz linux-8d58b66ed2b000f27658c88a4ed70e8042e86a58.zip | |
Merge tag 'v4.2-rc8' into x86/mm, before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/alpha/boot/tools/objstrip.c')
| -rw-r--r-- | arch/alpha/boot/tools/objstrip.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/alpha/boot/tools/objstrip.c b/arch/alpha/boot/tools/objstrip.c index 367d53d031fc..dee82695f48b 100644 --- a/arch/alpha/boot/tools/objstrip.c +++ b/arch/alpha/boot/tools/objstrip.c @@ -27,6 +27,9 @@ #include <linux/param.h> #ifdef __ELF__ # include <linux/elf.h> +# define elfhdr elf64_hdr +# define elf_phdr elf64_phdr +# define elf_check_arch(x) ((x)->e_machine == EM_ALPHA) #endif /* bootfile size must be multiple of BLOCK_SIZE: */ |