Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a16ef86c authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

[PATCH] arm26: fixup get_signal_to_deliver call 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarIan Molton <spyro@f2s.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 41a60ef0

arch/arm26/kernel/signal.c

+2 −1
Original line number Diff line number Diff line
@@ -480,6 +480,7 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall) 
{

	siginfo_t info;

	int signr;

	struct k_sigaction ka;



	/*

	 * We want the common case to go fast, which
@@ -493,7 +494,7 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall) 
        if (current->ptrace & PT_SINGLESTEP)

                ptrace_cancel_bpt(current);

	

        signr = get_signal_to_deliver(&info, regs, NULL);

        signr = get_signal_to_deliver(&info, &ka, regs, NULL);

        if (signr > 0) {

                handle_signal(signr, &info, oldset, regs, syscall);

                if (current->ptrace & PT_SINGLESTEP)