diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-04 15:59:53 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-04 15:59:53 (GMT) |
| commit | 02cf1da2548d318ad4db9eb4cf8656e24b11aefc (patch) | |
| tree | b966cb8239e1a934c2a91da67162b7a7a7b5ac8d /arch/tile/include/asm/elf.h | |
| parent | a4fdb2a46f617b8b2cd47acec026ec16532edbc6 (diff) | |
| parent | 8d03bc56cc27ddd93f70a630686ef06289787c78 (diff) | |
| download | linux-02cf1da2548d318ad4db9eb4cf8656e24b11aefc.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull tile updates from Chris Metcalf:
"This includes secure computing support as well as miscellaneous minor
improvements"
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
tile: correct some typos in opcode type names
tile/vdso: emit a GNU hash as well
tile: Remove finish_arch_switch
tile: enable full SECCOMP support
tile/time: Migrate to new 'set-state' interface
Diffstat (limited to 'arch/tile/include/asm/elf.h')
| -rw-r--r-- | arch/tile/include/asm/elf.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/tile/include/asm/elf.h b/arch/tile/include/asm/elf.h index 41d9878..c505d77 100644 --- a/arch/tile/include/asm/elf.h +++ b/arch/tile/include/asm/elf.h @@ -22,6 +22,7 @@ #include <arch/chip.h> #include <linux/ptrace.h> +#include <linux/elf-em.h> #include <asm/byteorder.h> #include <asm/page.h> @@ -30,9 +31,6 @@ typedef unsigned long elf_greg_t; #define ELF_NGREG (sizeof(struct pt_regs) / sizeof(elf_greg_t)) typedef elf_greg_t elf_gregset_t[ELF_NGREG]; -#define EM_TILEPRO 188 -#define EM_TILEGX 191 - /* Provide a nominal data structure. */ #define ELF_NFPREG 0 typedef double elf_fpreg_t; |