xnu-792.24.17.tar.gz

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

diff --git a/bsd/kern/bsd_stubs.c b/bsd/kern/bsd_stubs.c
index f7c4940ca77594a4ea41a9a043e063dbb8c83cb1..9a0c0605408911d19d8620051ec8c33f3420adb5 100644 (file)
--- a/bsd/kern/bsd_stubs.c
+++ b/bsd/kern/bsd_stubs.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@
  */
@@ -31,12 +28,14 @@
 #include <vm/vm_map.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
+#include <sys/proc_internal.h>
 #include <sys/buf.h>   /* for SET */
 #include <sys/user.h>
 
 /* Just to satisfy pstat command */
 int     dmmin, dmmax, dmtext;
 
+vm_offset_t
 kmem_mb_alloc(vm_map_t  mbmap, int size) 
 {
         vm_offset_t addr;
@@ -49,7 +48,13 @@ kmem_mb_alloc(vm_map_t  mbmap, int size)
                
 }
 
-pcb_synch() {}
+/*
+ * XXX this function only exists to be exported and do nothing.
+ */
+void
+pcb_synch(void)
+{
+}
 
 struct proc *
 current_proc(void)
@@ -57,10 +62,10 @@ current_proc(void)
        /* Never returns a NULL */
        struct uthread * ut;
        struct proc *p; 
-       thread_act_t thr_act = current_act();
+       thread_t thr_act = current_thread();
 
        ut = (struct uthread *)get_bsdthread_info(thr_act); 
-       if (ut &&  (ut->uu_flag & P_VFORK) && ut->uu_proc) {
+       if (ut &&  (ut->uu_flag & UT_VFORK) && ut->uu_proc) {
                p = ut->uu_proc;
                if ((p->p_flag & P_INVFORK) == 0) 
                        panic("returning child proc not under vfork");