diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 20:34:44 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 20:34:44 +0300 |
| commit | 6394d6d01bf0881823522f37601cbf880bc61087 (patch) | |
| tree | e5827ff7dc8b63014d9b068037ce50a5861b0f46 /arch/alpha/boot/tools/objstrip.c | |
| parent | 084861124d00b046cb4159b0158e1b74626b8257 (diff) | |
| parent | d4a4f75cd8f29cd9464a5a32e9224a91571d6649 (diff) | |
| download | linux-6394d6d01bf0881823522f37601cbf880bc61087.tar.xz | |
Merge 4.1-rc7 into staging-testing
We want the staging tree fixes in here too to help with testing and
merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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: */ |