diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /kernel/exit.c | |
parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) |
Merge branch 'linus'
Diffstat (limited to 'kernel/exit.c')
-rw-r--r-- | kernel/exit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index d1e8d500a7e1..8037405e136e 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -345,9 +345,9 @@ void daemonize(const char *name, ...) | |||
345 | exit_mm(current); | 345 | exit_mm(current); |
346 | 346 | ||
347 | set_special_pids(1, 1); | 347 | set_special_pids(1, 1); |
348 | down(&tty_sem); | 348 | mutex_lock(&tty_mutex); |
349 | current->signal->tty = NULL; | 349 | current->signal->tty = NULL; |
350 | up(&tty_sem); | 350 | mutex_unlock(&tty_mutex); |
351 | 351 | ||
352 | /* Block and flush all signals */ | 352 | /* Block and flush all signals */ |
353 | sigfillset(&blocked); | 353 | sigfillset(&blocked); |