update for new VM

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

diff --git a/usr/src/sys/kern/kern_synch.c b/usr/src/sys/kern/kern_synch.c
index 659b766..f7abfbc 100644 (file)
--- a/usr/src/sys/kern/kern_synch.c
+++ b/usr/src/sys/kern/kern_synch.c
@@ -3,21 +3,19 @@
  * 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.
  *

- *     @(#)kern_synch.c        7.12 (Berkeley) %G%
+ *     @(#)kern_synch.c        7.13 (Berkeley) %G%

  */
 
  */
 

-#include "machine/pte.h"
-#include "machine/psl.h"
-#include "machine/mtpr.h"
-

 #include "param.h"
 #include "systm.h"
 #include "user.h"
 #include "proc.h"
 #include "param.h"
 #include "systm.h"
 #include "user.h"
 #include "proc.h"

-#include "vm.h"

 #include "kernel.h"
 #include "buf.h"
 
 #include "kernel.h"
 #include "buf.h"
 

+#include "machine/psl.h"
+#include "machine/mtpr.h"
+

 /*
  * Force switch among equal priority processes every 100ms.
  */
 /*
  * Force switch among equal priority processes every 100ms.
  */


@@ -540,8 +538,6 @@ setpri(pp)
 
        p = (pp->p_cpu & 0377)/4;
        p += PUSER + 2 * pp->p_nice;
 
        p = (pp->p_cpu & 0377)/4;
        p += PUSER + 2 * pp->p_nice;

-       if (pp->p_rssize > pp->p_maxrss && freemem < desfree)
-               p += 2*4;       /* effectively, nice(4) */

        if (p > 127)
                p = 127;
        if (p < curpri) {
        if (p > 127)
                p = 127;
        if (p < curpri) {