update for new VM

[unix-history] / usr / src / sys / kern / subr_rmap.c

diff --git a/usr/src/sys/kern/subr_rmap.c b/usr/src/sys/kern/subr_rmap.c
index 7acbc57..eb0cef7 100644 (file)
--- a/usr/src/sys/kern/subr_rmap.c
+++ b/usr/src/sys/kern/subr_rmap.c
@@ -3,16 +3,14 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)subr_rmap.c 7.2 (Berkeley) %G%
+ *     @(#)subr_rmap.c 7.5 (Berkeley) %G%

  */
 
 #include "param.h"
 #include "systm.h"
 #include "map.h"
  */
 
 #include "param.h"
 #include "systm.h"
 #include "map.h"

-#include "dir.h"

 #include "user.h"
 #include "proc.h"
 #include "user.h"
 #include "proc.h"

-#include "text.h"

 #include "kernel.h"
 
 /*
 #include "kernel.h"
 
 /*


@@ -111,7 +109,7 @@ rmalloc(mp, size)
                         * boundaries.
                         */
                        if (mp == swapmap && nswdev > 1 &&
                         * boundaries.
                         */
                        if (mp == swapmap && nswdev > 1 &&

-                           (first = dmmax - bp->m_addr%dmmax) < bp->m_size) {
+                           (first = dmmax - bp->m_addr%dmmax) < size) {

                                if (bp->m_size - first < size)
                                        continue;
                                addr = bp->m_addr + first;
                                if (bp->m_size - first < size)
                                        continue;
                                addr = bp->m_addr + first;