xnu-792.6.76.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 bfe0a85c4f80dadcf081727dcc7efa5b8aadcc20..9a0c0605408911d19d8620051ec8c33f3420adb5 100644 (file)
--- a/bsd/kern/bsd_stubs.c
+++ b/bsd/kern/bsd_stubs.c
@@ -28,25 +28,33 @@
 #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;
        if (kernel_memory_allocate(mbmap, &addr, size,
                0,
                KMA_NOPAGEWAIT|KMA_KOBJECT) == KERN_SUCCESS)
-                                return((void *)addr);
+                       return(addr);
        else
                return(0);
                
 }
 
-pcb_synch() {}
+/*
+ * XXX this function only exists to be exported and do nothing.
+ */
+void
+pcb_synch(void)
+{
+}
 
 struct proc *
 current_proc(void)
@@ -54,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");
@@ -98,6 +106,9 @@ bdevsw_isfree(int index)
                            sizeof(struct bdevsw)) == 0)
                    break;
            }
+       } else {
+               /* NB: Not used below unless index is in range */
+               devsw = &bdevsw[index];
        }
 
        if ((index < 0) || (index >= nblkdev) ||
@@ -120,7 +131,7 @@ bdevsw_add(int index, struct bdevsw * bsw)
        struct bdevsw *devsw;
 
        if (index == -1) {
-           devsw = bdevsw;
+           devsw = &bdevsw[1];         /* Start at slot 1 - this is a hack to fix the index=1 hack */
            /* yes, start at 1 to avoid collision with volfs (Radar 2842228) */
            for(index=1; index < nblkdev; index++, devsw++) {
                if(memcmp((char *)devsw,