diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /arch/powerpc/kernel/vdso64 | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'arch/powerpc/kernel/vdso64')
| -rw-r--r-- | arch/powerpc/kernel/vdso64/sigtramp.S | 16 | ||||
| -rw-r--r-- | arch/powerpc/kernel/vdso64/vdso64.lds.S | 4 |
2 files changed, 1 insertions, 19 deletions
diff --git a/arch/powerpc/kernel/vdso64/sigtramp.S b/arch/powerpc/kernel/vdso64/sigtramp.S index 542c6f42..45ea281 100644 --- a/arch/powerpc/kernel/vdso64/sigtramp.S +++ b/arch/powerpc/kernel/vdso64/sigtramp.S @@ -142,13 +142,6 @@ V_FUNCTION_END(__kernel_sigtramp_rt64) /* Size of CR reg in DWARF unwind info. */ #define CRSIZE 4 -/* Offset of CR reg within a full word. */ -#ifdef __LITTLE_ENDIAN__ -#define CROFF 0 -#else -#define CROFF (RSIZE - CRSIZE) -#endif - /* This is the offset of the VMX reg pointer. */ #define VREGS 48*RSIZE+33*8 @@ -188,14 +181,7 @@ V_FUNCTION_END(__kernel_sigtramp_rt64) rsave (31, 31*RSIZE); \ rsave (67, 32*RSIZE); /* ap, used as temp for nip */ \ rsave (65, 36*RSIZE); /* lr */ \ - rsave (68, 38*RSIZE + CROFF); /* cr fields */ \ - rsave (69, 38*RSIZE + CROFF); \ - rsave (70, 38*RSIZE + CROFF); \ - rsave (71, 38*RSIZE + CROFF); \ - rsave (72, 38*RSIZE + CROFF); \ - rsave (73, 38*RSIZE + CROFF); \ - rsave (74, 38*RSIZE + CROFF); \ - rsave (75, 38*RSIZE + CROFF) + rsave (70, 38*RSIZE + (RSIZE - CRSIZE)) /* cr */ /* Describe where the FP regs are saved. */ #define EH_FRAME_FP \ diff --git a/arch/powerpc/kernel/vdso64/vdso64.lds.S b/arch/powerpc/kernel/vdso64/vdso64.lds.S index 64fb183..e486381 100644 --- a/arch/powerpc/kernel/vdso64/vdso64.lds.S +++ b/arch/powerpc/kernel/vdso64/vdso64.lds.S @@ -4,11 +4,7 @@ */ #include <asm/vdso.h> -#ifdef __LITTLE_ENDIAN__ -OUTPUT_FORMAT("elf64-powerpcle", "elf64-powerpcle", "elf64-powerpcle") -#else OUTPUT_FORMAT("elf64-powerpc", "elf64-powerpc", "elf64-powerpc") -#endif OUTPUT_ARCH(powerpc:common64) ENTRY(_start) |