From c6241e8cc2de47479d85c87182561b524cbe73ea Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 17 Oct 2007 14:26:50 +1000 Subject: [PATCH] --- yaml --- r: 70883 b: refs/heads/master c: 081c11a5d0cc24ab58adc7de2ddf209149bf176f h: refs/heads/master i: 70881: 606e7070b4949d31b55d9d10d86ae5770d654f68 70879: 6a48907a657d241dcf6ea4ac3f6f8336a3c37708 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/vdso64/sigtramp.S | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3ce09cbcaa9e..4159dbc66dab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f66bce5e6aa1388289c04496c3fcae7bebf5f905 +refs/heads/master: 081c11a5d0cc24ab58adc7de2ddf209149bf176f diff --git a/trunk/arch/powerpc/kernel/vdso64/sigtramp.S b/trunk/arch/powerpc/kernel/vdso64/sigtramp.S index 17a83fa6dc52..59eb59bb4082 100644 --- a/trunk/arch/powerpc/kernel/vdso64/sigtramp.S +++ b/trunk/arch/powerpc/kernel/vdso64/sigtramp.S @@ -134,13 +134,16 @@ V_FUNCTION_END(__kernel_sigtramp_rt64) 9: /* This is where the pt_regs pointer can be found on the stack. */ -#define PTREGS 128+168+56 +#define PTREGS 128+168+56 /* Size of regs. */ -#define RSIZE 8 +#define RSIZE 8 + +/* Size of CR reg in DWARF unwind info. */ +#define CRSIZE 4 /* This is the offset of the VMX reg pointer. */ -#define VREGS 48*RSIZE+33*8 +#define VREGS 48*RSIZE+33*8 /* Describe where general purpose regs are saved. */ #define EH_FRAME_GEN \ @@ -178,7 +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 (70, 38*RSIZE) /* cr */ + rsave (70, 38*RSIZE + (RSIZE - CRSIZE)) /* cr */ /* Describe where the FP regs are saved. */ #define EH_FRAME_FP \