[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 <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff --git a/arch/ppc/kernel/signal.c b/arch/ppc/kernel/signal.c
index 9567d30..645eae1 100644
--- a/arch/ppc/kernel/signal.c
+++ b/arch/ppc/kernel/signal.c
@@ -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;