2 files changed, 3 insertions, 7 deletions

diff --git a/arch/x86/kernel/kprobes_32.c b/arch/x86/kernel/kprobes_32.c
index d87a523070d1..3a020f79f82b 100644
--- a/arch/x86/kernel/kprobes_32.c
+++ b/arch/x86/kernel/kprobes_32.c
@@ -727,9 +727,7 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
 
         if ((addr > (u8 *) jprobe_return) && (addr < (u8 *) jprobe_return_end)) {
                 if (&regs->esp != kcb->jprobe_saved_esp) {
-                        struct pt_regs *saved_regs =
-                            container_of(kcb->jprobe_saved_esp,
-                                            struct pt_regs, esp);
+                        struct pt_regs *saved_regs = &kcb->jprobe_saved_regs;
                         printk("current esp %p does not match saved esp %p\n",
                                &regs->esp, kcb->jprobe_saved_esp);
                         printk("Saved registers for jprobe %p\n", jp);
diff --git a/arch/x86/kernel/kprobes_64.c b/arch/x86/kernel/kprobes_64.c
index 0c467644589c..a575059fb420 100644
--- a/arch/x86/kernel/kprobes_64.c
+++ b/arch/x86/kernel/kprobes_64.c
@@ -716,10 +716,8 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
         struct jprobe *jp = container_of(p, struct jprobe, kp);
 
         if ((addr > (u8 *) jprobe_return) && (addr < (u8 *) jprobe_return_end)) {
-                if ((long *)regs->rsp != kcb->jprobe_saved_rsp) {
-                        struct pt_regs *saved_regs =
-                            container_of(kcb->jprobe_saved_rsp,
-                                            struct pt_regs, rsp);
+                if ((unsigned long *)regs->rsp != kcb->jprobe_saved_rsp) {
+                        struct pt_regs *saved_regs = &kcb->jprobe_saved_regs;
                         printk("current rsp %p does not match saved rsp %p\n",
                                (long *)regs->rsp, kcb->jprobe_saved_rsp);
                         printk("Saved registers for jprobe %p\n", jp);