xnu-344.tar.gz

[apple/xnu.git] / bsd / kern / kern_shutdown.c

diff --git a/bsd/kern/kern_shutdown.c b/bsd/kern/kern_shutdown.c
index fcd80032e49303f047ba3fed5a279e66e2567ddf..45697a58db7c60164b3a29d0a48055b4a0598aaa 100644 (file)
--- a/bsd/kern/kern_shutdown.c
+++ b/bsd/kern/kern_shutdown.c
@@ -45,7 +45,7 @@
 #include <sys/signal.h>
 #include <sys/tty.h>
 #include <kern/task.h>
 #include <sys/signal.h>
 #include <sys/tty.h>
 #include <kern/task.h>

-#include <ufs/ufs/quota.h>
+#include <sys/quota.h>

 #include <ufs/ufs/inode.h>
 #if    NCPUS > 1
 #include <kern/processor.h>
 #include <ufs/ufs/inode.h>
 #if    NCPUS > 1
 #include <kern/processor.h>


@@ -171,13 +171,6 @@ proc_shutdown()
        if (p && p != self)
                task_suspend(p->task);          /* stop init */
 
        if (p && p != self)
                task_suspend(p->task);          /* stop init */
 

-       /*
-        * Suspend mach_init
-        */
-       p = pfind(2);
-       if (p && p != self)
-               task_suspend(p->task);          /* stop mach_init */
-

        printf("Killing all processes ");
 
        /*
        printf("Killing all processes ");
 
        /*


@@ -251,7 +244,8 @@ proc_shutdown()
                         * XXX
                         */
                        if (p->exit_thread) {   /* someone already doing it */
                         * XXX
                         */
                        if (p->exit_thread) {   /* someone already doing it */

-                               thread_block(0);/* give him a chance */
+                                               /* give him a chance */
+                               thread_block(THREAD_CONTINUE_NULL);

                        }
                        else {
                                p->exit_thread = current_thread();
                        }
                        else {
                                p->exit_thread = current_thread();