xnu-1228.15.4.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 70f1088aa137d848ad65e87f87db452eb17f9376..37a5afb3406a56b9714e032f0166ea081614043e 100644 (file)
--- a/bsd/kern/bsd_stubs.c
+++ b/bsd/kern/bsd_stubs.c
@@ -37,6 +37,18 @@
 #include <sys/proc_internal.h>
 #include <sys/buf.h>   /* for SET */
 #include <sys/user.h>
+#include <sys/sysent.h>
+#include <sys/sysproto.h>
+
+/* XXX these should be in a common header somwhere, but aren't */
+extern int chrtoblk_set(int, int);
+extern vm_offset_t kmem_mb_alloc(vm_map_t, int);
+
+/* XXX most of these just exist to export; there's no good header for them*/
+void   pcb_synch(void);
+int    issingleuser(void);
+void   tbeproc(void *);
+
 
 /* Just to satisfy pstat command */
 int     dmmin, dmmax, dmtext;
@@ -47,7 +59,7 @@ 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)
+               KMA_NOPAGEWAIT|KMA_KOBJECT|KMA_LOMEM) == KERN_SUCCESS)
                        return(addr);
        else
                return(0);
@@ -68,14 +80,14 @@ current_proc(void)
        /* Never returns a NULL */
        struct uthread * ut;
        struct proc *p; 
-       thread_t thr_act = current_thread();
+       thread_t thread = current_thread();
 
-       ut = (struct uthread *)get_bsdthread_info(thr_act); 
+       ut = (struct uthread *)get_bsdthread_info(thread); 
        if (ut &&  (ut->uu_flag & UT_VFORK) && ut->uu_proc) {
                p = ut->uu_proc;
-               if ((p->p_flag & P_INVFORK) == 0) 
+               if ((p->p_lflag & P_LINVFORK) == 0) 
                        panic("returning child proc not under vfork");
-               if (p->p_vforkact != (void *)thr_act) 
+               if (p->p_vforkact != (void *)thread) 
                        panic("returning child proc which is not cur_act");
                return(p);
        }
@@ -90,8 +102,6 @@ current_proc(void)
 
 /* Device switch add delete routines */
 
-extern int nblkdev, nchrdev;
-
 struct bdevsw nobdev = NO_BDEVICE;
 struct cdevsw nocdev = NO_CDEVICE;
 /* 
@@ -209,15 +219,28 @@ cdevsw_isfree(int index)
  *     if index is -1, find a free slot to add
  *       else see whether the slot is free
  *     return the major number that is used else -1
+ *
+ * NOTE:       In practice, -1 is unusable, since there are kernel internal
+ *             devices that call this function with absolute index values,
+ *             which will stomp on free-slot based assignments that happen
+ *             before them.  Therefore, if index is negative, we start
+ *             looking for a free slot at the absolute value of index,
+ *             instead of starting at 0 (lets out slot 1, but that's one
+ *             of the problem slots down low - the vndevice).  -12 is
+ *             currently a safe starting point.
  */
 int
 cdevsw_add(int index, struct cdevsw * csw) 
 {
        struct cdevsw *devsw;
 
-       if (index == -1) {
-           devsw = cdevsw;
-           for(index=0; index < nchrdev; index++, devsw++) {
+       if (index < 0) {
+           if (index == -1)
+               index = 0;      /* historical behaviour; XXX broken */
+           else
+               index = -index; /* start at least this far up in the table */
+           devsw = &cdevsw[index];
+           for(; index < nchrdev; index++, devsw++) {
                if(memcmp((char *)devsw, 
                            (char *)&nocdev, 
                            sizeof(struct cdevsw)) == 0)
@@ -257,8 +280,6 @@ cdevsw_remove(int index, struct cdevsw * csw)
 static int
 cdev_set_bdev(int cdev, int bdev)
 {
-       extern int chrtoblk_add(int cdev, int bdev);
-
        return (chrtoblk_set(cdev, bdev));
 }
 
@@ -276,25 +297,34 @@ cdevsw_add_with_bdev(int index, struct cdevsw * csw, int bdev)
        return (index);
 }
 
+#include <pexpert/pexpert.h>   /* for PE_parse_boot_arg */
+
+/*
+ * Notes:      This function is used solely by UFS, apparently in an effort
+ *             to work around an issue with single user mounts.
+ *
+ *             It's not technically correct to reference PE_parse_boot_arg()
+ *             from this file.
+ */
+int
 issingleuser(void)
 {
        char namep[16];
 
-
-       if (PE_parse_boot_arg("-s", namep)) {
+       if (PE_parse_boot_argn("-s", namep, sizeof(namep))) {
                return(1);
        } else {
                return(0);
        }
 }
 
-void *
+void
 tbeproc(void *procp)
 {
        struct proc *p = procp;
 
        if (p)
-               SET(p->p_flag, P_TBE);
+               OSBitOrAtomic(P_TBE, (UInt32 *)&p->p_flag);
        return;
 }