xnu-517.12.7.tar.gz

[apple/xnu.git] / osfmk / kern / thread_swap.c

diff --git a/osfmk/kern/thread_swap.c b/osfmk/kern/thread_swap.c
index 60655208a189531d97a285c1d1cc2f3ce1d7cbd7..159abcbc429db6276497afb50b4a21a499c3d928 100644 (file)
--- a/osfmk/kern/thread_swap.c
+++ b/osfmk/kern/thread_swap.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -83,9 +80,7 @@ swapin_init(void)
 {
         queue_init(&swapin_queue);
         simple_lock_init(&swapin_lock, ETAP_THREAD_SWAPPER);
-        kernel_thread_with_priority(
-                                               kernel_task, BASEPRI_PREEMPT - 2,
-                                                                               swapin_thread, TRUE, TRUE);
+        kernel_thread_with_priority(swapin_thread, MINPRI_KERNEL);
 }
 
 /*
@@ -154,7 +149,7 @@ thread_doswapin(
        thread_lock(thread);
        thread->state &= ~(TH_STACK_HANDOFF | TH_STACK_ALLOC);
        if (thread->state & TH_RUN)
-               thread_setrun(thread, HEAD_Q);
+               thread_setrun(thread, SCHED_PREEMPT | SCHED_TAILQ);
        thread_unlock(thread);
        (void) splx(s);
 }
@@ -195,10 +190,6 @@ swapin_thread_continue(void)
 void
 swapin_thread(void)
 {
-       thread_t        self = current_thread();
-
-       stack_privilege(self);
-
        swapin_thread_continue();
        /*NOTREACHED*/
 }