ia64: Correct unwind info for signal trampoline.

diff --git a/arch/ia64/kernel/gate.S b/arch/ia64/kernel/gate.S
index 09f619bc6c4de89e1cf218e63e489b78131dcd52..a233081db94147cc193cc12826975914c310b216 100644 (file)
--- a/arch/ia64/kernel/gate.S
+++ b/arch/ia64/kernel/gate.S
@@ -29,7 +29,7 @@
 #      define UNAT_OFF         IA64_SIGCONTEXT_AR_UNAT_OFFSET
 #      define FPSR_OFF         IA64_SIGCONTEXT_AR_FPSR_OFFSET
 #      define PR_OFF           IA64_SIGCONTEXT_PR_OFFSET
-#      define RP_OFF           IA64_SIGCONTEXT_B0_OFFSET
+#      define RP_OFF           IA64_SIGCONTEXT_IP_OFFSET
 #      define SP_OFF           IA64_SIGCONTEXT_R12_OFFSET
 #      define RBS_BASE_OFF     IA64_SIGCONTEXT_RBS_BASE_OFFSET
 #      define LOADRS_OFF       IA64_SIGCONTEXT_LOADRS_OFFSET

diff --git a/arch/ia64/tools/print_offsets.c b/arch/ia64/tools/print_offsets.c
index 02e84de2646dd71f14dc042f56c2c813e3c1e9de..e547371176070712a118fa7cf739882c0527ef14 100644 (file)
--- a/arch/ia64/tools/print_offsets.c
+++ b/arch/ia64/tools/print_offsets.c
@@ -143,6 +143,7 @@ tab[] =
     { "IA64_SWITCH_STACK_AR_RNAT_OFFSET",      offsetof (struct switch_stack, ar_rnat) },
     { "IA64_SWITCH_STACK_AR_BSPSTORE_OFFSET",  offsetof (struct switch_stack, ar_bspstore) },
     { "IA64_SWITCH_STACK_PR_OFFSET",   offsetof (struct switch_stack, pr) },
+    { "IA64_SIGCONTEXT_IP_OFFSET",     offsetof (struct sigcontext, sc_ip) },
     { "IA64_SIGCONTEXT_AR_BSP_OFFSET", offsetof (struct sigcontext, sc_ar_bsp) },
     { "IA64_SIGCONTEXT_AR_FPSR_OFFSET", offsetof (struct sigcontext, sc_ar_fpsr) },
     { "IA64_SIGCONTEXT_AR_RNAT_OFFSET",        offsetof (struct sigcontext, sc_ar_rnat) },