diff --git a/sys/vm/kern_lock.c b/sys/vm/kern_lock.c index 70a6b4a64f16..27e5f5b5f418 100644 --- a/sys/vm/kern_lock.c +++ b/sys/vm/kern_lock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)kern_lock.c 7.4 (Berkeley) 4/21/91 - * $Id: kern_lock.c,v 1.4 1993/12/20 12:39:58 cgd Exp $ + * $Id: kern_lock.c,v 1.5 1994/01/07 22:22:20 mycroft Exp $ * * * Copyright (c) 1987, 1990 Carnegie-Mellon University. @@ -218,7 +218,7 @@ void lock_write(l) if (l->can_sleep && l->want_write) { l->waiting = TRUE; - thread_sleep((int) l, &l->interlock, FALSE); + thread_sleep((int) l, &l->interlock); simple_lock(&l->interlock); } } @@ -237,7 +237,7 @@ void lock_write(l) if (l->can_sleep && (l->read_count != 0 || l->want_upgrade)) { l->waiting = TRUE; - thread_sleep((int) l, &l->interlock, FALSE); + thread_sleep((int) l, &l->interlock); simple_lock(&l->interlock); } } @@ -293,7 +293,7 @@ void lock_read(l) if (l->can_sleep && (l->want_write || l->want_upgrade)) { l->waiting = TRUE; - thread_sleep((int) l, &l->interlock, FALSE); + thread_sleep((int) l, &l->interlock); simple_lock(&l->interlock); } } @@ -357,7 +357,7 @@ boolean_t lock_read_to_write(l) if (l->can_sleep && l->read_count != 0) { l->waiting = TRUE; - thread_sleep((int) l, &l->interlock, FALSE); + thread_sleep((int) l, &l->interlock); simple_lock(&l->interlock); } } @@ -496,7 +496,7 @@ boolean_t lock_try_read_to_write(l) while (l->read_count != 0) { l->waiting = TRUE; - thread_sleep((int) l, &l->interlock, FALSE); + thread_sleep((int) l, &l->interlock); simple_lock(&l->interlock); } diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 7bf3735953e0..8feb6102f3c8 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -519,14 +519,10 @@ thread_block() splx(s); } -thread_sleep(event, lock, ruptible) +thread_sleep(event, lock) int event; simple_lock_t lock; - boolean_t ruptible; { -#ifdef lint - ruptible++; -#endif int s = splhigh(); curproc->p_thread = event; diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 871f0d79d082..3bf31b6ad926 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)vm_object.c 7.4 (Berkeley) 5/7/91 - * $Id: vm_object.c,v 1.12 1994/01/07 19:15:44 mycroft Exp $ + * $Id: vm_object.c,v 1.13 1994/01/07 22:22:24 mycroft Exp $ * * * Copyright (c) 1987, 1990 Carnegie-Mellon University. @@ -368,7 +368,7 @@ vm_object_terminate(object) */ while (object->paging_in_progress != 0) { - vm_object_sleep(object, object, FALSE); + vm_object_sleep(object, object); vm_object_lock(object); } diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index cb2e96e6a3d4..86a7a0166a87 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)vm_object.h 7.3 (Berkeley) 4/21/91 - * $Id: vm_object.h,v 1.5 1993/12/20 12:40:17 cgd Exp $ + * $Id: vm_object.h,v 1.6 1994/01/07 22:22:26 mycroft Exp $ * * * Copyright (c) 1987, 1990 Carnegie-Mellon University. @@ -161,7 +161,7 @@ void vm_object_print(); simple_unlock(&(object)->Lock) #define vm_object_lock_try(object) \ simple_lock_try(&(object)->Lock) -#define vm_object_sleep(event, object, interruptible) \ - thread_sleep((event), &(object)->Lock, (interruptible)) +#define vm_object_sleep(event, object) \ + thread_sleep((event), &(object)->Lock) #endif /* !_VM_VM_OBJECT_H_ */ diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index 703a7ee50489..648499cd558b 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)vm_pageout.c 7.4 (Berkeley) 5/7/91 - * $Id: vm_pageout.c,v 1.8 1994/01/07 18:14:07 mycroft Exp $ + * $Id: vm_pageout.c,v 1.9 1994/01/07 22:23:31 mycroft Exp $ * * * Copyright (c) 1987, 1990 Carnegie-Mellon University. @@ -389,8 +389,7 @@ vm_pageout() simple_lock(&vm_pages_needed_lock); while (TRUE) { - thread_sleep((int) &vm_pages_needed, &vm_pages_needed_lock, - FALSE); + thread_sleep((int) &vm_pages_needed, &vm_pages_needed_lock); cnt.v_scan++; vm_pageout_scan(); vm_pager_sync(); diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h index c153696da786..0f3098e78f7d 100644 --- a/sys/vm/vm_pageout.h +++ b/sys/vm/vm_pageout.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)vm_pageout.h 7.3 (Berkeley) 4/21/91 - * $Id: vm_pageout.h,v 1.3 1993/05/20 03:59:41 cgd Exp $ + * $Id: vm_pageout.h,v 1.4 1994/01/07 22:22:27 mycroft Exp $ * * * Copyright (c) 1987, 1990 Carnegie-Mellon University. @@ -90,7 +90,7 @@ simple_lock_data_t vm_pages_needed_lock; simple_lock(&vm_pages_needed_lock); \ thread_wakeup((int)&vm_pages_needed); \ thread_sleep((int)&vm_page_free_count, \ - &vm_pages_needed_lock, FALSE); \ + &vm_pages_needed_lock); \ } #endif /* !_VM_VM_PAGEOUT_H_ */