diff options
Diffstat (limited to 'arch/score/include')
| -rw-r--r-- | arch/score/include/asm/elf.h | 18 | ||||
| -rw-r--r-- | arch/score/include/asm/irqflags.h | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/arch/score/include/asm/elf.h b/arch/score/include/asm/elf.h index 832436375ac..43526d9fda9 100644 --- a/arch/score/include/asm/elf.h +++ b/arch/score/include/asm/elf.h @@ -1,9 +1,8 @@ #ifndef _ASM_SCORE_ELF_H #define _ASM_SCORE_ELF_H -/* ELF register definitions */ -#define ELF_NGREG 45 -#define ELF_NFPREG 33 +#include <linux/ptrace.h> + #define EM_SCORE7 135 /* Relocation types. */ @@ -30,11 +29,15 @@ #define R_SCORE_IMM30 20 #define R_SCORE_IMM32 21 -typedef unsigned long elf_greg_t; -typedef elf_greg_t elf_gregset_t[ELF_NGREG]; +/* ELF register definitions */ +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]; -typedef double elf_fpreg_t; -typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; +/* Score does not have fp regs. */ +typedef double elf_fpreg_t; +typedef elf_fpreg_t elf_fpregset_t; #define elf_check_arch(x) ((x)->e_machine == EM_SCORE7) @@ -57,6 +60,7 @@ do { \ struct task_struct; struct pt_regs; +#define CORE_DUMP_USE_REGSET #define USE_ELF_CORE_DUMP #define ELF_EXEC_PAGESIZE PAGE_SIZE diff --git a/arch/score/include/asm/irqflags.h b/arch/score/include/asm/irqflags.h index 92eeb33dd72..690a6cae729 100644 --- a/arch/score/include/asm/irqflags.h +++ b/arch/score/include/asm/irqflags.h @@ -17,8 +17,6 @@ "nop;" \ "nop;" \ "nop;" \ - "ldi r9, 0x1;" \ - "and %0, %0, r9;" \ : "=r" (x) \ : \ : "r8", "r9" \ |