xnu-2050.24.15.tar.gz

[apple/xnu.git] / bsd / dev / i386 / stubs.c

diff --git a/bsd/dev/i386/stubs.c b/bsd/dev/i386/stubs.c
index d98a823d620d99c77af012ace3948e00bc0b6fc6..ddc759c29b54cf2eb1f1f7458084f9c511aee40f 100644 (file)
--- a/bsd/dev/i386/stubs.c
+++ b/bsd/dev/i386/stubs.c
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * 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. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1997 by Apple Computer, Inc., all rights reserved
@@ -40,7 +46,6 @@
 #include <machine/machine_routines.h>
 
 /* XXX should be elsewhere (cpeak) */
-extern struct proc *i386_current_proc(void);
 extern void    *get_bsduthreadarg(thread_t);
 extern int     *get_bsduthreadrval(thread_t);
 extern void    *find_user_regs(thread_t);
@@ -112,46 +117,11 @@ copywithin(void *src, void *dst, size_t count)
        return 0;
 }
 
-/*
- * This is just current_proc() from bsd/kern/bsd_stubs.c, but instead of
- * returning kernproc in the non-vfork() case, it can return NULL.  This is
- * needed because the system call entry point is in osfmk/i386/bsd_i386.c
- * instead of bsd/dev/i386, and therefore cannot see some BSD thread
- * internals.  We need to distinguish kernproc defaulting in the vfork and
- * non-vfork cases vs. actually being the real process context.
- */     
-struct proc *
-i386_current_proc(void)
-{       
-       struct uthread * ut;
-       struct proc *p; 
-       thread_t thr_act = current_thread();
-
-       ut = (struct uthread *)get_bsdthread_info(thr_act);
-       if (ut &&  (ut->uu_flag & UT_VFORK)) { 
-               if (ut->uu_proc) {
-                       p = ut->uu_proc; 
-                       if ((p->p_flag & P_INVFORK) == 0)
-                               panic("returning child proc not under vfork");
-                       if (p->p_vforkact != (void *)thr_act)
-                               panic("returning child proc which is not cur_act");
-                       return(p);
-               } else {
-                       return (kernproc);
-               }
-       }
-
-       /* Not in vfork - may return NULL */
-       p = (struct proc *)get_bsdtask_info(current_task());
-
-       return (p);
-}
-
 void *
 get_bsduthreadarg(thread_t th)
 {
         void   *arg_ptr;
-       struct uthread *ut;
+struct uthread *ut;
   
        ut = get_bsdthread_info(th);
 
@@ -166,7 +136,7 @@ get_bsduthreadarg(thread_t th)
 int *
 get_bsduthreadrval(thread_t th)
 {
-        struct uthread *ut;
+struct uthread *ut;
 
        ut = get_bsdthread_info(th);
        return(&ut->uu_rval[0]);