summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2003-04-23 18:21:41 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2003-04-23 18:21:41 +0000
commit11edc1e0d727662aa98fc35b38a2bf7475c7a11f (patch)
treebb2139ccb5ea6d40a250b0c2aba24ada42e8178d
parentc6004a62025d59825f4b31288fa98cf23535408c (diff)
Notes
-rw-r--r--sys/vm/vm_glue.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 1edd45ca25cc..e211e5d7d6e4 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -513,14 +513,16 @@ void
faultin(p)
struct proc *p;
{
- struct thread *td;
+#ifdef NO_SWAPPING
- GIANT_REQUIRED;
PROC_LOCK_ASSERT(p, MA_OWNED);
-#ifdef NO_SWAPPING
if ((p->p_sflag & PS_INMEM) == 0)
panic("faultin: proc swapped out with NO_SWAPPING!");
-#else
+#else /* !NO_SWAPPING */
+ struct thread *td;
+
+ GIANT_REQUIRED;
+ PROC_LOCK_ASSERT(p, MA_OWNED);
/*
* If another process is swapping in this process,
* just wait until it finishes.
@@ -558,7 +560,7 @@ faultin(p)
/* Allow other threads to swap p out now. */
--p->p_lock;
}
-#endif
+#endif /* NO_SWAPPING */
}
/*