This commit was generated by cvs2svn to track changes on a CVS vendor

[unix-history] / sys / kern / init_main.c

diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 4de5614..4e3470e 100644 (file)
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *     from: @(#)init_main.c   7.41 (Berkeley) 5/15/91
  * SUCH DAMAGE.
  *
  *     from: @(#)init_main.c   7.41 (Berkeley) 5/15/91

- *     $Id: init_main.c,v 1.13 1993/12/23 09:28:22 davidg Exp $
+ *     $Id: init_main.c,v 1.15 1994/03/06 03:20:31 jkh Exp $

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


@@ -77,7 +77,7 @@ struct        filedesc0 filedesc0;
 struct plimit limit0;
 struct vmspace vmspace0;
 struct proc *curproc = &proc0;
 struct plimit limit0;
 struct vmspace vmspace0;
 struct proc *curproc = &proc0;

-struct proc *initproc, *pageproc;
+struct proc *initproc, *pageproc, *pagescanproc, *updateproc;

 
 int    cmask = CMASK;
 extern struct user *proc0paddr;
 
 int    cmask = CMASK;
 extern struct user *proc0paddr;


@@ -86,8 +86,6 @@ extern        int (*mountroot)();
 struct vnode *rootvp, *swapdev_vp;
 int    boothowto;
 
 struct vnode *rootvp, *swapdev_vp;
 int    boothowto;
 

-struct proc *updateproc;
-

 #if __GNUC__ >= 2
 void __main() {}
 #endif
 #if __GNUC__ >= 2
 void __main() {}
 #endif


@@ -351,7 +349,7 @@ main()
         * Start up pageout daemon (process 2).
         */
        if (fork(p, (void *) NULL, rval))
         * Start up pageout daemon (process 2).
         */
        if (fork(p, (void *) NULL, rval))

-               panic("fork pager");
+               panic("failed fork pageout daemon");

        if (rval[1]) {
                /*
                 * Now in process 2.
        if (rval[1]) {
                /*
                 * Now in process 2.


@@ -364,11 +362,28 @@ main()
                /*NOTREACHED*/
        }
 
                /*NOTREACHED*/
        }
 

+#if 1
+       /*
+        * Start page scanner daemon (process 3).
+        */
+       if (fork(p, (void *) NULL, rval))
+               panic("failed fork page scanner daemon");
+       if (rval[1]) {
+               p = curproc;
+               pagescanproc = p;
+               p->p_flag |= SLOAD|SSYS;
+               bcopy("pagescan", p->p_comm, sizeof("pagescan"));
+               vm_pagescan();
+               /*NOTREACHED*/
+       }
+#endif
+

        /*
        /*

-        * Start update daemon (process 3).
+        * Start update daemon (process 4).

         */
         */

+#ifndef LAPTOP

        if (fork(p, (void *) NULL, rval))
        if (fork(p, (void *) NULL, rval))

-               panic("fork update");
+               panic("failed fork update daemon");

        if (rval[1]) {
                p = curproc;
                updateproc = p;
        if (rval[1]) {
                p = curproc;
                updateproc = p;


@@ -377,6 +392,7 @@ main()
                vfs_update();
                /*NOTREACHED*/
        }
                vfs_update();
                /*NOTREACHED*/
        }

+#endif

 
        /*
         * enter scheduling loop
 
        /*
         * enter scheduling loop