diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-03-23 06:00:31 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 10:38:11 -0500 |
commit | 70522e121a521aa09bd0f4e62e1aa68708b798e1 (patch) | |
tree | 1233412da73361b48ed01290a33ab7c90e36359a /kernel | |
parent | d4f9af9dac4ecb75818f909168f87b441cc95653 (diff) |
[PATCH] sem2mutex: tty
Semaphore to mutex conversion.
The conversion was generated via scripts, and the result was validated
automatically via a script as well.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/exit.c | 4 | ||||
-rw-r--r-- | kernel/sys.c | 4 |
2 files changed, 4 insertions, 4 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); |
diff --git a/kernel/sys.c b/kernel/sys.c index 4941b9b14b97..c0fcad9f826c 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -1227,7 +1227,7 @@ asmlinkage long sys_setsid(void) | |||
1227 | struct pid *pid; | 1227 | struct pid *pid; |
1228 | int err = -EPERM; | 1228 | int err = -EPERM; |
1229 | 1229 | ||
1230 | down(&tty_sem); | 1230 | mutex_lock(&tty_mutex); |
1231 | write_lock_irq(&tasklist_lock); | 1231 | write_lock_irq(&tasklist_lock); |
1232 | 1232 | ||
1233 | pid = find_pid(PIDTYPE_PGID, group_leader->pid); | 1233 | pid = find_pid(PIDTYPE_PGID, group_leader->pid); |
@@ -1241,7 +1241,7 @@ asmlinkage long sys_setsid(void) | |||
1241 | err = process_group(group_leader); | 1241 | err = process_group(group_leader); |
1242 | out: | 1242 | out: |
1243 | write_unlock_irq(&tasklist_lock); | 1243 | write_unlock_irq(&tasklist_lock); |
1244 | up(&tty_sem); | 1244 | mutex_unlock(&tty_mutex); |
1245 | return err; | 1245 | return err; |
1246 | } | 1246 | } |
1247 | 1247 | ||