From 314273374283fd165833f84a9eebde9b1291f912 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 8 Aug 2006 03:47:01 +0100 Subject: [PATCH] --- yaml --- r: 36008 b: refs/heads/master c: 13fdd31abec5f48cf97693bd14d2e11e0779b4ca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/irixsig.c | 1 + trunk/arch/mips/kernel/signal.c | 2 +- trunk/arch/mips/kernel/signal32.c | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f80c05e2c881..699077e9b74f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 847b9dfccad7dd34b2e44b1c6ceeb1c4cb88084a +refs/heads/master: 13fdd31abec5f48cf97693bd14d2e11e0779b4ca diff --git a/trunk/arch/mips/kernel/irixsig.c b/trunk/arch/mips/kernel/irixsig.c index 052ea15f1e80..719364752e77 100644 --- a/trunk/arch/mips/kernel/irixsig.c +++ b/trunk/arch/mips/kernel/irixsig.c @@ -224,6 +224,7 @@ void do_irix_signal(struct pt_regs *regs) regs->regs[7] = regs->regs[26]; regs->cp0_epc -= 4; } + regs->regs[0] = 0; /* Don't deal with this again. */ } /* diff --git a/trunk/arch/mips/kernel/signal.c b/trunk/arch/mips/kernel/signal.c index 56bf42911336..b9d358e05214 100644 --- a/trunk/arch/mips/kernel/signal.c +++ b/trunk/arch/mips/kernel/signal.c @@ -429,7 +429,6 @@ void do_signal(struct pt_regs *regs) else oldset = ¤t->blocked; - signr = get_signal_to_deliver(&info, &ka, regs, NULL); if (signr > 0) { /* Whee! Actually deliver the signal. */ @@ -464,6 +463,7 @@ void do_signal(struct pt_regs *regs) regs->regs[7] = regs->regs[26]; regs->cp0_epc -= 4; } + regs->regs[0] = 0; /* Don't deal with this again. */ } /* diff --git a/trunk/arch/mips/kernel/signal32.c b/trunk/arch/mips/kernel/signal32.c index 282e85a7bae1..c86a5ddff050 100644 --- a/trunk/arch/mips/kernel/signal32.c +++ b/trunk/arch/mips/kernel/signal32.c @@ -854,6 +854,7 @@ void do_signal32(struct pt_regs *regs) regs->regs[7] = regs->regs[26]; regs->cp0_epc -= 4; } + regs->regs[0] = 0; /* Don't deal with this again. */ } /*