diff options
author | jhb <jhb@FreeBSD.org> | 2001-08-10 06:56:12 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2001-08-10 06:56:12 +0000 |
commit | def8c67e008a01368f7fd9376b096b00517a36bd (patch) | |
tree | 503ff4a04b0a98cac4206d20dbde60e8d450b725 | |
parent | 6c7715413445f5c8d7517f23cbe78e5ab7d94a45 (diff) | |
download | FreeBSD-src-def8c67e008a01368f7fd9376b096b00517a36bd.zip FreeBSD-src-def8c67e008a01368f7fd9376b096b00517a36bd.tar.gz |
- Remove asleep(), await(), and M_ASLEEP.
- Callers of asleep() and await() have been converted to calling tsleep().
The only caller outside of M_ASLEEP was the ata driver, which called both
asleep() and await() with spl-raised, so there was no need for the
asleep() and await() pair. M_ASLEEP was unused.
Reviewed by: jasone, peter
-rw-r--r-- | sys/sys/proc.h | 10 | ||||
-rw-r--r-- | sys/vm/vm_kern.c | 7 |
2 files changed, 2 insertions, 15 deletions
diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 35b5ea4..03d0d51 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -93,15 +93,6 @@ struct procsig { #define PS_NOCLDSTOP 0x0002 /* No SIGCHLD when children stop. */ /* - * pasleep structure, used by asleep() syscall to hold requested priority - * and timeout values for await(). - */ -struct pasleep { - int as_priority; /* Async priority. */ - int as_timo; /* Async timeout. */ -}; - -/* * pargs, used to hold a copy of the command line, if it had a sane length. */ struct pargs { @@ -274,7 +265,6 @@ struct proc { struct proc *p_peers; /* (c) */ struct proc *p_leader; /* (c) */ - struct pasleep p_asleep; /* (k) Used by asleep()/await(). */ void *p_emuldata; /* (c) Emulator state data. */ struct trapframe *p_frame; /* (k) */ }; diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 96199cd..7ab7c08 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -349,14 +349,14 @@ kmem_malloc(map, size, flags) /* * Note: if M_NOWAIT specified alone, allocate from * interrupt-safe queues only (just the free list). If - * M_ASLEEP or M_USE_RESERVE is also specified, we can also + * M_USE_RESERVE is also specified, we can also * allocate from the cache. Neither of the latter two * flags may be specified from an interrupt since interrupts * are not allowed to mess with the cache queue. */ retry: m = vm_page_alloc(kmem_object, OFF_TO_IDX(offset + i), - ((flags & (M_NOWAIT|M_ASLEEP|M_USE_RESERVE)) == M_NOWAIT) ? + ((flags & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) ? VM_ALLOC_INTERRUPT : VM_ALLOC_SYSTEM); @@ -374,9 +374,6 @@ retry: } vm_map_delete(map, addr, addr + size); vm_map_unlock(map); - if (flags & M_ASLEEP) { - VM_AWAIT; - } goto bad; } vm_page_flag_clear(m, PG_ZERO); |