diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-04-17 02:24:14 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 02:24:14 +0400 |
| commit | 16acbc624e2b7b750570cb672341d05a816051f4 (patch) | |
| tree | ca337baa5a2950ae6a3ff8eb19ac5ae15cbb70c5 | |
| parent | 0c9b79429c83a404a04908be65baa9d97836bbb6 (diff) | |
| download | linux-16acbc624e2b7b750570cb672341d05a816051f4.tar.xz | |
[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>
| -rw-r--r-- | arch/ppc/kernel/signal.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ppc/kernel/signal.c b/arch/ppc/kernel/signal.c index 9567d3041ea7..645eae19805c 100644 --- a/arch/ppc/kernel/signal.c +++ b/arch/ppc/kernel/signal.c @@ -708,7 +708,6 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs) 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 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs) 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 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs) 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; |