diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /arch/arm/include/asm/elf.h | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/include/asm/elf.h')
| -rw-r--r-- | arch/arm/include/asm/elf.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h index 6750b8e45a49..5747a8baa413 100644 --- a/arch/arm/include/asm/elf.h +++ b/arch/arm/include/asm/elf.h | |||
| @@ -59,6 +59,8 @@ typedef struct user_fp elf_fpregset_t; | |||
| 59 | 59 | ||
| 60 | #define R_ARM_THM_CALL 10 | 60 | #define R_ARM_THM_CALL 10 |
| 61 | #define R_ARM_THM_JUMP24 30 | 61 | #define R_ARM_THM_JUMP24 30 |
| 62 | #define R_ARM_THM_MOVW_ABS_NC 47 | ||
| 63 | #define R_ARM_THM_MOVT_ABS 48 | ||
| 62 | 64 | ||
| 63 | /* | 65 | /* |
| 64 | * These are used to set parameters in the core dumps. | 66 | * These are used to set parameters in the core dumps. |