xnu-7195.101.1.tar.gz

[apple/xnu.git] / bsd / dev / dtrace / blist.c

diff --git a/bsd/dev/dtrace/blist.c b/bsd/dev/dtrace/blist.c
index 180d30ffb9b39cbe1a90fdc935cb2af1c1a3c664..3fefa43b97272e0d60c02e615af7a38fb6494385 100644 (file)
--- a/bsd/dev/dtrace/blist.c
+++ b/bsd/dev/dtrace/blist.c
@@ -62,69 +62,23 @@
  * $FreeBSD: src/sys/kern/subr_blist.c,v 1.5.2.1 2000/03/17 10:47:29 ps Exp $
  */
 
  * $FreeBSD: src/sys/kern/subr_blist.c,v 1.5.2.1 2000/03/17 10:47:29 ps Exp $
  */
 

-#if !defined(__APPLE__)
-#ifdef _KERNEL
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/lock.h>
-#include <sys/kernel.h>
-#include <sys/blist.h>
-#include <sys/malloc.h>
-#include <vm/vm.h>
-#include <vm/vm_object.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_extern.h>
-#include <vm/vm_page.h>
-
-#else
-
-#ifndef BLIST_NO_DEBUG
-#define BLIST_DEBUG
-#endif
-
-#define SWAPBLK_NONE ((daddr_t)-1)
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#define malloc(a, b, c)   malloc(a)
-#define free(a, b)       free(a)
-
-typedef unsigned int u_daddr_t;
-
-#include <sys/blist.h>
-
-void panic(const char *ctl, ...);
-
-#endif
-#else /* is MacOS X */
-#ifdef KERNEL
-#ifndef _KERNEL
-#define _KERNEL /* Solaris vs. Darwin */
-#endif
-#endif
-

 typedef unsigned int u_daddr_t;
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
 #include <sys/kernel.h>
 typedef unsigned int u_daddr_t;
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
 #include <sys/kernel.h>

-/* #include <sys/blist.h> */

 #include "blist.h"
 #include <sys/malloc.h>
 
 #include "blist.h"
 #include <sys/malloc.h>
 

+#if !defined(__APPLE__)

 #define SWAPBLK_NONE ((daddr_t)-1)
 #define SWAPBLK_NONE ((daddr_t)-1)

+#endif
+

 #define malloc _MALLOC
 #define free _FREE
 #define M_SWAP M_TEMP
 
 #define malloc _MALLOC
 #define free _FREE
 #define M_SWAP M_TEMP
 

-#endif /* __APPLE__ */
-

 /*
  * static support functions
  */
 /*
  * static support functions
  */


@@ -139,16 +93,6 @@ static void blst_copy(blmeta_t *scan, daddr_t blk, daddr_t radix,
     daddr_t skip, blist_t dest, daddr_t count);
 static daddr_t  blst_radix_init(blmeta_t *scan, daddr_t radix,
     int skip, daddr_t count);
     daddr_t skip, blist_t dest, daddr_t count);
 static daddr_t  blst_radix_init(blmeta_t *scan, daddr_t radix,
     int skip, daddr_t count);

-#ifndef _KERNEL
-static void     blst_radix_print(blmeta_t *scan, daddr_t blk,
-    daddr_t radix, int skip, int tab);
-#endif
-
-#if !defined(__APPLE__)
-#ifdef _KERNEL
-static MALLOC_DEFINE(M_SWAP, "SWAP", "Swap space");
-#endif
-#endif /* __APPLE__ */

 
 /*
  * blist_create() - create a blist capable of handling up to the specified
 
 /*
  * blist_create() - create a blist capable of handling up to the specified