diff --git a/[refs] b/[refs] index 80cd3a1fbb78..b42d78dddd67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94eb22d5056b5eca10c587bf064e0e6db0ae6161 +refs/heads/master: 4aaefee589f97bb30062bbeeb793bbbf7107a9a7 diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c index 421d5b6bcdbc..2e3b5d572808 100644 --- a/trunk/kernel/signal.c +++ b/trunk/kernel/signal.c @@ -1159,8 +1159,9 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t, return __send_signal(sig, info, t, group, from_ancestor_ns); } -static void print_fatal_signal(struct pt_regs *regs, int signr) +static void print_fatal_signal(int signr) { + struct pt_regs *regs = signal_pt_regs(); printk("%s/%d: potentially unexpected fatal signal %d.\n", current->comm, task_pid_nr(current), signr); @@ -2349,7 +2350,7 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, if (sig_kernel_coredump(signr)) { if (print_fatal_signals) - print_fatal_signal(regs, info->si_signo); + print_fatal_signal(info->si_signo); /* * If it was able to dump core, this kills all * other threads in the group and synchronizes with