diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
| commit | db7d4daea91e105e3859cf461d7e53b9b77454b2 (patch) | |
| tree | 9bb65b95440af09e8aca63abe56970dd3360cc57 /kernel/exit.c | |
| parent | 9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff) | |
Merge with Linux 2.2.8.
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 58eb6df5d..b11ed8a11 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -32,9 +32,9 @@ void release(struct task_struct * p) */ for (;;) { int has_cpu; - spin_lock(&scheduler_lock); + spin_lock_irq(&runqueue_lock); has_cpu = p->has_cpu; - spin_unlock(&scheduler_lock); + spin_unlock_irq(&runqueue_lock); if (!has_cpu) break; do { @@ -169,7 +169,7 @@ static inline void close_files(struct files_struct * files) struct file * file = files->fd[i]; if (file) { files->fd[i] = NULL; - close_fp(file, files); + filp_close(file, files); } } i++; |