diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
commit | e4b636366c00738b9609cda307014d71b1225b7f (patch) | |
tree | 760b67b3624eda62e943e48ce93635c30a5b47bf /arch/arm/include/asm/elf.h | |
parent | b9ed7252d219c1c663944bf03846eabb515dbe75 (diff) | |
parent | 279e677faa775ad16e75c32e1bf4a37f8158bc61 (diff) |
Merge branch 'master' into for-2.6.31
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/arm/include/asm/elf.h')
-rw-r--r-- | arch/arm/include/asm/elf.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h index d7da19bcf928..c207504de84d 100644 --- a/arch/arm/include/asm/elf.h +++ b/arch/arm/include/asm/elf.h | |||
@@ -45,13 +45,15 @@ typedef struct user_fp elf_fpregset_t; | |||
45 | #define EF_ARM_HASENTRY 0x00000002 /* All */ | 45 | #define EF_ARM_HASENTRY 0x00000002 /* All */ |
46 | #define EF_ARM_RELEXEC 0x00000001 /* All */ | 46 | #define EF_ARM_RELEXEC 0x00000001 /* All */ |
47 | 47 | ||
48 | #define R_ARM_NONE 0 | 48 | #define R_ARM_NONE 0 |
49 | #define R_ARM_PC24 1 | 49 | #define R_ARM_PC24 1 |
50 | #define R_ARM_ABS32 2 | 50 | #define R_ARM_ABS32 2 |
51 | #define R_ARM_CALL 28 | 51 | #define R_ARM_CALL 28 |
52 | #define R_ARM_JUMP24 29 | 52 | #define R_ARM_JUMP24 29 |
53 | #define R_ARM_V4BX 40 | 53 | #define R_ARM_V4BX 40 |
54 | #define R_ARM_PREL31 42 | 54 | #define R_ARM_PREL31 42 |
55 | #define R_ARM_MOVW_ABS_NC 43 | ||
56 | #define R_ARM_MOVT_ABS 44 | ||
55 | 57 | ||
56 | /* | 58 | /* |
57 | * These are used to set parameters in the core dumps. | 59 | * These are used to set parameters in the core dumps. |