tree 553e4605a88c38a9028e648451d03f21023be098
parent 92efba238617570e0d933364657e3f0c122dbcb3
author Paul Mackerras <[EMAIL PROTECTED]> Tue Apr 12 08:24:48 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:24:48 2005
[PATCH] ppc32: fix bogosity in process-freezing code
The code that went into arch/ppc/kernel/signal.c recently to handle process
freezing seems to contain a dubious assumption: that a process that calls
do_signal when PF_FREEZE is set will have entered the kernel because of a
system call. This patch removes that assumption.
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
signal.c | 4 +---
1 files changed, 1 insertion(+), 3 deletions(-)
Index: arch/ppc/kernel/signal.c
===================================================================
--- 9d8f49c017ffde1476855f3bbe16597b831cbbf9/arch/ppc/kernel/signal.c
(mode:100644 sha1:c94e3988d1c1fe3d5377af5a9f3d6a0f2877c58b)
+++ 553e4605a88c38a9028e648451d03f21023be098/arch/ppc/kernel/signal.c
(mode:100644 sha1:76e516986b634960a757a3404400e39462b46a42)
@@ -708,7 +708,6 @@
if (current->flags & PF_FREEZE) {
refrigerator(PF_FREEZE);
signr = 0;
- ret = regs->gpr[3];
if (!signal_pending(current))
goto no_signal;
}
@@ -719,7 +718,7 @@
newsp = frame = 0;
signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-
+ no_signal:
if (TRAP(regs) == 0x0C00 /* System Call! */
&& regs->ccr & 0x10000000 /* error signalled */
&& ((ret = regs->gpr[3]) == ERESTARTSYS
@@ -735,7 +734,6 @@
regs->gpr[3] = EINTR;
/* note that the cr0.SO bit is already set */
} else {
-no_signal:
regs->nip -= 4; /* Back up & retry system call */
regs->result = 0;
regs->trap = 0;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
