xnu-517.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 eebece1cb743f4b9ea5586bce6e081faac75eda2..f7c4940ca77594a4ea41a9a043e063dbb8c83cb1 100644 (file)
--- a/bsd/kern/bsd_stubs.c
+++ b/bsd/kern/bsd_stubs.c
@@ -43,7 +43,7 @@ kmem_mb_alloc(vm_map_t  mbmap, int size)
        if (kernel_memory_allocate(mbmap, &addr, size,
                0,
                KMA_NOPAGEWAIT|KMA_KOBJECT) == KERN_SUCCESS)
        if (kernel_memory_allocate(mbmap, &addr, size,
                0,
                KMA_NOPAGEWAIT|KMA_KOBJECT) == KERN_SUCCESS)

-                                return((void *)addr);
+                       return(addr);

        else
                return(0);
                
        else
                return(0);
                


@@ -101,6 +101,9 @@ bdevsw_isfree(int index)
                            sizeof(struct bdevsw)) == 0)
                    break;
            }
                            sizeof(struct bdevsw)) == 0)
                    break;
            }

+       } else {
+               /* NB: Not used below unless index is in range */
+               devsw = &bdevsw[index];

        }
 
        if ((index < 0) || (index >= nblkdev) ||
        }
 
        if ((index < 0) || (index >= nblkdev) ||


@@ -123,7 +126,7 @@ bdevsw_add(int index, struct bdevsw * bsw)
        struct bdevsw *devsw;
 
        if (index == -1) {
        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, 
            /* yes, start at 1 to avoid collision with volfs (Radar 2842228) */
            for(index=1; index < nblkdev; index++, devsw++) {
                if(memcmp((char *)devsw,