diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /arch/sparc64/kernel/ptrace.c | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'arch/sparc64/kernel/ptrace.c')
| -rw-r--r-- | arch/sparc64/kernel/ptrace.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c index ac91df894..3df35ef14 100644 --- a/arch/sparc64/kernel/ptrace.c +++ b/arch/sparc64/kernel/ptrace.c @@ -609,10 +609,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs) unsigned long tmp; int res; -#if 0 - /* XXX Find out what is really going on. */ - flush_cache_all(); -#endif /* Non-word alignment _not_ allowed on Sparc. */ if (current->tss.flags & SPARC_FLAG_32BIT) { unsigned int x; @@ -1055,7 +1051,7 @@ asmlinkage void syscall_trace(void) current->exit_code = SIGTRAP; current->state = TASK_STOPPED; current->tss.flags ^= MAGIC_CONSTANT; - notify_parent(current); + notify_parent(current, SIGCHLD); schedule(); /* * this isn't the same as continuing with a signal, but it will do @@ -1067,9 +1063,9 @@ asmlinkage void syscall_trace(void) current->pid, current->exit_code); #endif if (current->exit_code) { - /* spin_lock_irq(¤t->sigmask_lock); */ + spin_lock_irq(¤t->sigmask_lock); current->signal |= (1 << (current->exit_code - 1)); - /* spin_unlock_irq(¤t->sigmask_lock); */ + spin_unlock_irq(¤t->sigmask_lock); } current->exit_code = 0; |