xnu-1228.3.13.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 fa75f2b89736d19f9e4fa715e6655f75a1a67235..ddc759c29b54cf2eb1f1f7458084f9c511aee40f 100644 (file)
--- a/bsd/dev/i386/stubs.c
+++ b/bsd/dev/i386/stubs.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -46,7 +46,6 @@
 #include <machine/machine_routines.h>
 
 /* XXX should be elsewhere (cpeak) */
 #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);
 extern void    *get_bsduthreadarg(thread_t);
 extern int     *get_bsduthreadrval(thread_t);
 extern void    *find_user_regs(thread_t);


@@ -118,46 +117,11 @@ copywithin(void *src, void *dst, size_t count)
        return 0;
 }
 
        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;
 void *
 get_bsduthreadarg(thread_t th)
 {
         void   *arg_ptr;

-       struct uthread *ut;
+struct uthread *ut;

   
        ut = get_bsdthread_info(th);
 
   
        ut = get_bsdthread_info(th);
 


@@ -172,7 +136,7 @@ get_bsduthreadarg(thread_t th)
 int *
 get_bsduthreadrval(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]);
 
        ut = get_bsdthread_info(th);
        return(&ut->uu_rval[0]);