From 4a333c03ffd4d6fe89ca24d5753fd33ef4e5424f Mon Sep 17 00:00:00 2001 From: Michael Holzheu Date: Mon, 15 Apr 2013 17:50:03 +0200 Subject: [PATCH] --- yaml --- r: 362794 b: refs/heads/master c: bd9e034ef340e3a00301f67b00a247617891f1f0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/compat_signal.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3f4aa786e63f..10d508e9a241 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c55768765e7b488ff20832c6ba89ea4e017a7b1b +refs/heads/master: bd9e034ef340e3a00301f67b00a247617891f1f0 diff --git a/trunk/arch/s390/kernel/compat_signal.c b/trunk/arch/s390/kernel/compat_signal.c index 6de049fbe62d..c439ac9ced09 100644 --- a/trunk/arch/s390/kernel/compat_signal.c +++ b/trunk/arch/s390/kernel/compat_signal.c @@ -362,6 +362,7 @@ static int setup_frame32(int sig, struct k_sigaction *ka, /* set extra registers only for synchronous signals */ regs->gprs[4] = regs->int_code & 127; regs->gprs[5] = regs->int_parm_long; + regs->gprs[6] = task_thread_info(current)->last_break; } /* Place signal number on stack to allow backtrace from handler. */ @@ -421,6 +422,7 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info, regs->gprs[2] = map_signal(sig); regs->gprs[3] = (__force __u64) &frame->info; regs->gprs[4] = (__force __u64) &frame->uc; + regs->gprs[5] = task_thread_info(current)->last_break; return 0; give_sigsegv: