tree ca337baa5a2950ae6a3ff8eb19ac5ae15cbb70c5
parent 0c9b79429c83a404a04908be65baa9d97836bbb6
author Paul Mackerras <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:14 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:14 -0700
[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]>
ppc/kernel/signal.c | 4 +---
1 files changed, 1 insertion(+), 3 deletions(-)
Index: arch/ppc/kernel/signal.c
===================================================================
--- 66cdf9fc4cf40867ed8c9dc060661615941cd95f/arch/ppc/kernel/signal.c
(mode:100644 sha1:9567d3041ea7c2e818c13987ad381ce997274768)
+++ ca337baa5a2950ae6a3ff8eb19ac5ae15cbb70c5/arch/ppc/kernel/signal.c
(mode:100644 sha1:645eae19805cc7495904272b15e96c1751b842ac)
@@ -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
