From cddfb7bbf69cda108af06f3eb47ac51d3a1928b9 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Sun, 3 Sep 2006 18:52:30 +0000
Subject: [PATCH] Rename functions to avoid conflicts with libc.

---
 sys/dev/misc/syscons/dragon/dragon_saver.c |  8 ++++----
 sys/dev/misc/syscons/fire/fire_saver.c     |  4 ++--
 sys/dev/misc/syscons/rain/rain_saver.c     |  4 ++--
 sys/dev/misc/syscons/snake/snake_saver.c   |  6 +++---
 sys/dev/misc/syscons/star/star_saver.c     | 12 ++++++------
 sys/dev/misc/syscons/warp/warp_saver.c     |  4 ++--
 sys/dev/netif/awi/awi_wep.c                |  4 ++--
 sys/emulation/ndis/subr_ntoskrnl.c         |  6 +++---
 sys/kern/init_main.c                       |  4 ++--
 sys/kern/kern_synch.c                      |  4 ++--
 sys/libkern/random.c                       |  6 +++---
 sys/net/altq/altq_classq.h                 |  4 ++--
 sys/net/dummynet/ip_dummynet.c             |  8 ++++----
 sys/net/i4b/layer2/i4b_tei.c               |  4 ++--
 sys/net/i4b/layer4/i4b_l4mgmt.c            |  4 ++--
 sys/net/ipfw/ip_fw.c                       |  6 +++---
 sys/net/ipfw/ip_fw2.c                      |  5 +++--
 sys/net/sppp/if_spppsubr.c                 | 18 +++++++++---------
 sys/netinet/igmp_var.h                     |  4 ++--
 sys/netinet6/esp_output.c                  |  4 ++--
 sys/netinet6/frag6.c                       |  4 ++--
 sys/netinet6/in6_ifattach.c                |  6 +++---
 sys/netinet6/ip6_input.c                   |  6 +++---
 sys/netinet6/mld6_var.h                    |  4 ++--
 sys/netinet6/nd6.h                         |  4 ++--
 sys/netinet6/nd6_nbr.c                     |  6 +++---
 sys/netproto/ipsec/key.c                   |  6 +++---
 sys/netproto/key/key.c                     |  6 +++---
 sys/sys/libkern.h                          |  6 +++---
 sys/vfs/gnu/ext2fs/ext2_alloc.c            |  4 ++--
 sys/vfs/gnu/ext2fs/ext2_vfsops.c           |  4 ++--
 sys/vfs/msdosfs/msdosfs_fat.c              |  4 ++--
 sys/vfs/nfs/nfs_subs.c                     |  4 ++--
 sys/vfs/ufs/ffs_alloc.c                    |  4 ++--
 sys/vfs/ufs/ffs_vfsops.c                   |  4 ++--
 35 files changed, 96 insertions(+), 95 deletions(-)

diff --git a/sys/dev/misc/syscons/dragon/dragon_saver.c b/sys/dev/misc/syscons/dragon/dragon_saver.c
index 0110dc3609..9b907d0fec 100644
--- a/sys/dev/misc/syscons/dragon/dragon_saver.c
+++ b/sys/dev/misc/syscons/dragon/dragon_saver.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/modules/syscons/dragon/dragon_saver.c,v 1.1.2.1 2003/05/11 01:17:02 murray Exp $
- * $DragonFly: src/sys/dev/misc/syscons/dragon/dragon_saver.c,v 1.5 2005/06/11 00:26:47 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/syscons/dragon/dragon_saver.c,v 1.6 2006/09/03 18:52:26 dillon Exp $
  */
 
 #include	<sys/param.h>
@@ -122,12 +122,12 @@ dragon_update(video_adapter_t *adp)
 
 		/* set palette of each curves */
 		for (tmp = 0; tmp < 3*CURVE; ++tmp) {
-			dragon_pal[3+tmp] = (u_char)random(); 
+			dragon_pal[3+tmp] = (u_char)krandom(); 
 		}
 		load_palette(adp, dragon_pal);
 
-		mul = ((random() & 7) + 1) * (SCRW / 320);
-		org_x = random() % SCRW; org_y = random() % SCRH;
+		mul = ((krandom() & 7) + 1) * (SCRW / 320);
+		org_x = krandom() % SCRW; org_y = krandom() % SCRH;
 
 		curve = 0;
 		order = ORDER;
diff --git a/sys/dev/misc/syscons/fire/fire_saver.c b/sys/dev/misc/syscons/fire/fire_saver.c
index 13d1187721..7ac3df220c 100644
--- a/sys/dev/misc/syscons/fire/fire_saver.c
+++ b/sys/dev/misc/syscons/fire/fire_saver.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/modules/syscons/fire/fire_saver.c,v 1.6.2.1 2000/05/10 14:01:23 obrien Exp $
- * $DragonFly: src/sys/dev/misc/syscons/fire/fire_saver.c,v 1.3 2003/08/15 08:32:30 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/syscons/fire/fire_saver.c,v 1.4 2006/09/03 18:52:27 dillon Exp $
  */
 
 /*
@@ -85,7 +85,7 @@ fire_saver(video_adapter_t *adp, int blank)
 	}
 	/* make a new bottom line */
 	for (x = 0, y = Y_SIZE; x < X_SIZE; x++)
-	    buf[x + (y * X_SIZE)] = random() % 160 + 96;
+	    buf[x + (y * X_SIZE)] = krandom() % 160 + 96;
 
 	/* fade the flames out */
 	for (y = 0; y < Y_SIZE; y++) {
diff --git a/sys/dev/misc/syscons/rain/rain_saver.c b/sys/dev/misc/syscons/rain/rain_saver.c
index 73e1954faa..c087d0796d 100644
--- a/sys/dev/misc/syscons/rain/rain_saver.c
+++ b/sys/dev/misc/syscons/rain/rain_saver.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/modules/syscons/rain/rain_saver.c,v 1.5.2.1 2000/05/10 16:26:47 obrien Exp $
- * $DragonFly: src/sys/dev/misc/syscons/rain/rain_saver.c,v 1.6 2005/06/11 00:26:50 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/syscons/rain/rain_saver.c,v 1.7 2006/09/03 18:52:28 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -83,7 +83,7 @@ rain_saver(video_adapter_t *adp, int blank)
 	    crit_exit();
 	    bzero(vid, SCRW*SCRH);
 	    for (i = 0; i < SCRW; i += 2)
-		vid[i] = 1 + (random() % RAINMAX);
+		vid[i] = 1 + (krandom() % RAINMAX);
 	    for (j = 1, k = SCRW; j < SCRH; j++)
 		for (i = 0; i < SCRW; i += 2, k += 2)
 		    vid[k] = (vid[k-SCRW] < RAINMAX) ? 1 + vid[k-SCRW] : 1;
diff --git a/sys/dev/misc/syscons/snake/snake_saver.c b/sys/dev/misc/syscons/snake/snake_saver.c
index 9327743aec..72e0fe3a74 100644
--- a/sys/dev/misc/syscons/snake/snake_saver.c
+++ b/sys/dev/misc/syscons/snake/snake_saver.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/modules/syscons/snake/snake_saver.c,v 1.26.2.2 2001/05/06 05:44:29 nyan Exp $
- * $DragonFly: src/sys/dev/misc/syscons/snake/snake_saver.c,v 1.5 2005/03/28 21:30:23 swildner Exp $
+ * $DragonFly: src/sys/dev/misc/syscons/snake/snake_saver.c,v 1.6 2006/09/03 18:52:28 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -93,11 +93,11 @@ snake_saver(video_adapter_t *adp, int blank)
 		f = savs[0];
 		if ((f % scp->xsize) == 0 ||
 		    (f % scp->xsize) == scp->xsize - 1 ||
-		    (random() % 50) == 0)
+		    (krandom() % 50) == 0)
 			dirx = -dirx;
 		if ((f / scp->xsize) == 0 ||
 		    (f / scp->xsize) == scp->ysize - 1 ||
-		    (random() % 20) == 0)
+		    (krandom() % 20) == 0)
 			diry = -diry;
 		savs[0] += dirx + diry;
 		for (f=messagelen-1; f>=0; f--)
diff --git a/sys/dev/misc/syscons/star/star_saver.c b/sys/dev/misc/syscons/star/star_saver.c
index 1591940971..6037bffe78 100644
--- a/sys/dev/misc/syscons/star/star_saver.c
+++ b/sys/dev/misc/syscons/star/star_saver.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/modules/syscons/star/star_saver.c,v 1.23.2.2 2001/05/06 05:44:29 nyan Exp $
- * $DragonFly: src/sys/dev/misc/syscons/star/star_saver.c,v 1.4 2005/02/13 03:02:26 swildner Exp $
+ * $DragonFly: src/sys/dev/misc/syscons/star/star_saver.c,v 1.5 2006/09/03 18:52:28 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -78,16 +78,16 @@ star_saver(video_adapter_t *adp, int blank)
 			blanked = TRUE;
 			for(i=0; i<NUM_STARS; i++) {
 				stars[i][0] =
-					random() % (scp->xsize*scp->ysize);
+					krandom() % (scp->xsize*scp->ysize);
 				stars[i][1] = 0;
 			}
 		}
-		cell = random() % NUM_STARS;
+		cell = krandom() % NUM_STARS;
 		sc_vtb_putc(&scp->scr, stars[cell][0], 
 			    sc->scr_map[pattern[stars[cell][1]]],
-			    colors[random()%sizeof(colors)] << 8);
-		if ((stars[cell][1]+=(random()%4)) >= sizeof(pattern)-1) {
-			stars[cell][0] = random() % (scp->xsize*scp->ysize);
+			    colors[krandom()%sizeof(colors)] << 8);
+		if ((stars[cell][1]+=(krandom()%4)) >= sizeof(pattern)-1) {
+			stars[cell][0] = krandom() % (scp->xsize*scp->ysize);
 			stars[cell][1] = 0;
 		}
 	}
diff --git a/sys/dev/misc/syscons/warp/warp_saver.c b/sys/dev/misc/syscons/warp/warp_saver.c
index 3d54d77933..9a7a963834 100644
--- a/sys/dev/misc/syscons/warp/warp_saver.c
+++ b/sys/dev/misc/syscons/warp/warp_saver.c
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/modules/syscons/warp/warp_saver.c,v 1.7.2.1 2000/05/10 16:26:47 obrien Exp $
- * $DragonFly: src/sys/dev/misc/syscons/warp/warp_saver.c,v 1.4 2005/06/11 00:26:51 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/syscons/warp/warp_saver.c,v 1.5 2006/09/03 18:52:28 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -117,7 +117,7 @@ warp_init(video_adapter_t *adp)
 
     /* randomize the star field */
     for (i = 0; i < STARS; i++) {
-	star[i] = random() % (SCRW*SCRH);
+	star[i] = krandom() % (SCRW*SCRH);
     }
     
     blanked = 0;
diff --git a/sys/dev/netif/awi/awi_wep.c b/sys/dev/netif/awi/awi_wep.c
index 3337be18fb..dd0ee24b15 100644
--- a/sys/dev/netif/awi/awi_wep.c
+++ b/sys/dev/netif/awi/awi_wep.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: awi_wep.c,v 1.4 2000/08/14 11:28:03 onoe Exp $	*/
 /* $FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.3.2.2 2003/01/23 21:06:42 sam Exp $ */
-/* $DragonFly: src/sys/dev/netif/awi/Attic/awi_wep.c,v 1.14 2006/08/06 12:49:04 swildner Exp $ */
+/* $DragonFly: src/sys/dev/netif/awi/Attic/awi_wep.c,v 1.15 2006/09/03 18:52:28 dillon Exp $ */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -300,7 +300,7 @@ awi_wep_encrypt(struct awi_softc *sc, struct mbuf *m0, int txflag)
 		kid = sc->sc_wep_defkid;
 		wh = mtod(n, struct ieee80211_frame *);
 		wh->i_fc[1] |= IEEE80211_FC1_WEP;
-		iv = random();
+		iv = krandom();
 		/*
 		 * store IV, byte order is not the matter since it's random.
 		 * assuming IEEE80211_WEP_IVLEN is 3
diff --git a/sys/emulation/ndis/subr_ntoskrnl.c b/sys/emulation/ndis/subr_ntoskrnl.c
index a4a19e5ccb..7221857fd5 100644
--- a/sys/emulation/ndis/subr_ntoskrnl.c
+++ b/sys/emulation/ndis/subr_ntoskrnl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.40 2004/07/20 20:28:57 wpaul Exp $
- * $DragonFly: src/sys/emulation/ndis/subr_ntoskrnl.c,v 1.7 2005/12/10 16:06:20 swildner Exp $
+ * $DragonFly: src/sys/emulation/ndis/subr_ntoskrnl.c,v 1.8 2006/09/03 18:52:28 dillon Exp $
  */
 
 #include <sys/ctype.h>
@@ -1217,8 +1217,8 @@ rand(void)
 	struct timeval		tv;
 
 	microtime(&tv);
-	srandom(tv.tv_usec);
-	return((int)random());
+	skrandom(tv.tv_usec);
+	return((int)krandom());
 }
 
 __stdcall static uint8_t
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 0f10e33ca7..41f5193682 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -40,7 +40,7 @@
  *
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/init_main.c,v 1.134.2.8 2003/06/06 20:21:32 tegge Exp $
- * $DragonFly: src/sys/kern/init_main.c,v 1.60 2006/09/03 17:43:59 dillon Exp $
+ * $DragonFly: src/sys/kern/init_main.c,v 1.61 2006/09/03 18:52:28 dillon Exp $
  */
 
 #include "opt_init_path.h"
@@ -381,7 +381,7 @@ proc0_post(void *dummy __unused)
 	 * XXX: Does read_random() contain enough bits to be used here ?
 	 */
 	nanotime(&ts);
-	srandom(ts.tv_sec ^ ts.tv_nsec);
+	skrandom(ts.tv_sec ^ ts.tv_nsec);
 }
 
 static int
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index ca30ed5d89..ce54bbb08a 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -37,7 +37,7 @@
  *
  *	@(#)kern_synch.c	8.9 (Berkeley) 5/19/95
  * $FreeBSD: src/sys/kern/kern_synch.c,v 1.87.2.6 2002/10/13 07:29:53 kbyanc Exp $
- * $DragonFly: src/sys/kern/kern_synch.c,v 1.65 2006/09/03 18:29:16 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_synch.c,v 1.66 2006/09/03 18:52:28 dillon Exp $
  */
 
 #include "opt_ktrace.h"
@@ -968,7 +968,7 @@ loadav(void *arg)
 	 * random variation to avoid synchronisation with processes that
 	 * run at regular intervals.
 	 */
-	callout_reset(&loadav_callout, hz * 4 + (int)(random() % (hz * 2 + 1)),
+	callout_reset(&loadav_callout, hz * 4 + (int)(krandom() % (hz * 2 + 1)),
 		      loadav, NULL);
 }
 
diff --git a/sys/libkern/random.c b/sys/libkern/random.c
index bec3125551..3676d5966f 100644
--- a/sys/libkern/random.c
+++ b/sys/libkern/random.c
@@ -32,7 +32,7 @@
  *
  *	@(#)random.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/libkern/random.c,v 1.7 1999/08/28 00:46:36 peter Exp $
- * $DragonFly: src/sys/libkern/random.c,v 1.5 2004/01/28 14:36:00 joerg Exp $
+ * $DragonFly: src/sys/libkern/random.c,v 1.6 2006/09/03 18:52:29 dillon Exp $
  */
 
 #include <sys/libkern.h>
@@ -40,7 +40,7 @@
 static u_long randseed = 1;
 
 void
-srandom(u_long seed)
+skrandom(u_long seed)
 {
 	randseed = seed;
 }
@@ -51,7 +51,7 @@ srandom(u_long seed)
  * [0, 2^31 - 1].
  */
 u_long
-random(void)
+krandom(void)
 {
 	long x, hi, lo, t;
 
diff --git a/sys/net/altq/altq_classq.h b/sys/net/altq/altq_classq.h
index 3924c79420..fb396342b0 100644
--- a/sys/net/altq/altq_classq.h
+++ b/sys/net/altq/altq_classq.h
@@ -1,5 +1,5 @@
 /*	$KAME: altq_classq.h,v 1.6 2003/01/07 07:33:38 kjc Exp $	*/
-/*	$DragonFly: src/sys/net/altq/altq_classq.h,v 1.1 2005/02/11 22:25:57 joerg Exp $ */
+/*	$DragonFly: src/sys/net/altq/altq_classq.h,v 1.2 2006/09/03 18:52:29 dillon Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Regents of the University of California.
@@ -138,7 +138,7 @@ _getq_random(class_queue_t *q)
 	else {
 		struct mbuf *prev = NULL;
 
-		n = random() % qlen(q) + 1;
+		n = krandom() % qlen(q) + 1;
 		for (i = 0; i < n; i++) {
 			prev = m;
 			m = m->m_nextpkt;
diff --git a/sys/net/dummynet/ip_dummynet.c b/sys/net/dummynet/ip_dummynet.c
index 8fbe9714bd..435644153f 100644
--- a/sys/net/dummynet/ip_dummynet.c
+++ b/sys/net/dummynet/ip_dummynet.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.24.2.22 2003/05/13 09:31:06 maxim Exp $
- * $DragonFly: src/sys/net/dummynet/ip_dummynet.c,v 1.18 2006/06/25 11:02:39 corecode Exp $
+ * $DragonFly: src/sys/net/dummynet/ip_dummynet.c,v 1.19 2006/09/03 18:52:29 dillon Exp $
  */
 
 #if !defined(KLD_MODULE)
@@ -978,7 +978,7 @@ red_drops(struct dn_flow_set *fs, struct dn_flow_queue *q, int len)
     if (fs->flags_fs & DN_QSIZE_IS_BYTES)
 	p_b = (p_b * len) / fs->max_pkt_size;
     if (++q->count == 0)
-	q->random = random() & 0xffff;
+	q->random = krandom() & 0xffff;
     else {
 	/*
 	 * q->count counts packets arrived since last drop, so a greater
@@ -988,7 +988,7 @@ red_drops(struct dn_flow_set *fs, struct dn_flow_queue *q, int len)
 	    q->count = 0;
 	    DEB(printf("- red drop");)
 	    /* after a drop we calculate a new random value */
-	    q->random = random() & 0xffff;
+	    q->random = krandom() & 0xffff;
 	    return 1;    /* drop */
 	}
     }
@@ -1101,7 +1101,7 @@ dummynet_io(struct mbuf *m, int pipe_nr, int dir, struct ip_fw_args *fwa)
      */
     q->tot_bytes += len ;
     q->tot_pkts++ ;
-    if ( fs->plr && random() < fs->plr )
+    if ( fs->plr && krandom() < fs->plr )
 	goto dropit ;		/* random pkt drop			*/
     if ( fs->flags_fs & DN_QSIZE_IS_BYTES) {
     	if (q->len_bytes > fs->qsize)
diff --git a/sys/net/i4b/layer2/i4b_tei.c b/sys/net/i4b/layer2/i4b_tei.c
index 6c174f7aa9..c03c657b8a 100644
--- a/sys/net/i4b/layer2/i4b_tei.c
+++ b/sys/net/i4b/layer2/i4b_tei.c
@@ -30,7 +30,7 @@
  *	$Id: i4b_tei.c,v 1.25 2000/09/01 14:11:51 hm Exp $ 
  *
  * $FreeBSD: src/sys/i4b/layer2/i4b_tei.c,v 1.6.2.2 2001/08/10 14:08:41 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer2/i4b_tei.c,v 1.6 2005/06/14 21:19:19 joerg Exp $
+ * $DragonFly: src/sys/net/i4b/layer2/i4b_tei.c,v 1.7 2006/09/03 18:52:29 dillon Exp $
  *
  *      last edit-date: [Fri Oct 13 15:56:35 2000]
  *
@@ -276,7 +276,7 @@ i4b_make_rand_ri(l2_softc_t *l2sc)
 #ifdef RANDOMDEV
         read_random((char *)&val, sizeof(val));
 #else
-	val = (u_short)random();
+	val = (u_short)krandom();
 #endif /* RANDOMDEV */ 
 	l2sc->last_rih = (val >> 8) & 0x00ff;
 	l2sc->last_ril = val & 0x00ff;
diff --git a/sys/net/i4b/layer4/i4b_l4mgmt.c b/sys/net/i4b/layer4/i4b_l4mgmt.c
index 46c93f3fec..86a05f8c42 100644
--- a/sys/net/i4b/layer4/i4b_l4mgmt.c
+++ b/sys/net/i4b/layer4/i4b_l4mgmt.c
@@ -30,7 +30,7 @@
  *	$Id: i4b_l4mgmt.c,v 1.34 2000/09/01 14:11:51 hm Exp $ 
  *
  * $FreeBSD: src/sys/i4b/layer4/i4b_l4mgmt.c,v 1.6.2.2 2001/08/10 14:08:43 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer4/i4b_l4mgmt.c,v 1.8 2005/06/14 21:19:19 joerg Exp $
+ * $DragonFly: src/sys/net/i4b/layer4/i4b_l4mgmt.c,v 1.9 2006/09/03 18:52:29 dillon Exp $
  *
  *      last edit-date: [Fri Oct 13 15:58:34 2000]
  *
@@ -247,7 +247,7 @@ get_rand_cr(int unit)
 #ifdef RANDOMDEV
 		read_random((char *)&val, sizeof(val));
 #else
-		val = (u_char)random();
+		val = (u_char)krandom();
 #endif /* RANDOMDEV */
 
 		retval = val & 0x7f;
diff --git a/sys/net/ipfw/ip_fw.c b/sys/net/ipfw/ip_fw.c
index e0fa90710d..6cec721745 100644
--- a/sys/net/ipfw/ip_fw.c
+++ b/sys/net/ipfw/ip_fw.c
@@ -14,7 +14,7 @@
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
  * $FreeBSD: src/sys/netinet/ip_fw.c,v 1.131.2.39 2003/01/20 02:23:07 iedowse Exp $
- * $DragonFly: src/sys/net/ipfw/Attic/ip_fw.c,v 1.16 2006/06/25 11:02:39 corecode Exp $
+ * $DragonFly: src/sys/net/ipfw/Attic/ip_fw.c,v 1.17 2006/09/03 18:52:29 dillon Exp $
  */
 
 #define        DEB(x)
@@ -1221,7 +1221,7 @@ again:
 			f = q->rule ;
 			q->pcnt++ ;
 			q->bcnt += ip_len;
-			goto got_match ; /* random not allowed here */
+			goto got_match ; /* krandom not allowed here */
 		    }
 		    /* if this was a check-only rule, continue with next */
 		    if (f->fw_flg & IP_FW_F_CHECK_S)
@@ -1446,7 +1446,7 @@ bogusfrag:
 		}
 
 rnd_then_got_match:
-		if ( f->dont_match_prob && random() < f->dont_match_prob )
+		if ( f->dont_match_prob && krandom() < f->dont_match_prob )
 			continue ;
 got_match:
 		/*
diff --git a/sys/net/ipfw/ip_fw2.c b/sys/net/ipfw/ip_fw2.c
index 8f8b155b1f..82e5e5902b 100644
--- a/sys/net/ipfw/ip_fw2.c
+++ b/sys/net/ipfw/ip_fw2.c
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.6.2.12 2003/04/08 10:42:32 maxim Exp $
- * $DragonFly: src/sys/net/ipfw/ip_fw2.c,v 1.19 2006/06/25 11:02:39 corecode Exp $
+ * $DragonFly: src/sys/net/ipfw/ip_fw2.c,v 1.20 2006/09/03 18:52:29 dillon Exp $
  */
 
 #define        DEB(x)
@@ -1746,7 +1746,8 @@ check_body:
 				break;
 
 			case O_PROB:
-				match = (random()<((ipfw_insn_u32 *)cmd)->d[0]);
+				match = (krandom() <
+					((ipfw_insn_u32 *)cmd)->d[0]);
 				break;
 
 			/*
diff --git a/sys/net/sppp/if_spppsubr.c b/sys/net/sppp/if_spppsubr.c
index d5a43175fa..8f418958ab 100644
--- a/sys/net/sppp/if_spppsubr.c
+++ b/sys/net/sppp/if_spppsubr.c
@@ -18,7 +18,7 @@
  * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
  *
  * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.59.2.13 2002/07/03 15:44:41 joerg Exp $
- * $DragonFly: src/sys/net/sppp/if_spppsubr.c,v 1.24 2006/08/23 20:43:17 joerg Exp $
+ * $DragonFly: src/sys/net/sppp/if_spppsubr.c,v 1.25 2006/09/03 18:52:29 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -1320,7 +1320,7 @@ sppp_cisco_input(struct sppp *sp, struct mbuf *m)
 
 			/* Generate new local sequence number */
 #if defined(__DragonFly__)
-			sp->pp_seq[IDX_LCP] = random();
+			sp->pp_seq[IDX_LCP] = krandom();
 #else
 			sp->pp_seq[IDX_LCP] ^= time.tv_sec ^ time.tv_usec;
 #endif
@@ -2611,7 +2611,7 @@ sppp_lcp_RCN_nak(struct sppp *sp, struct lcp_header *h, int len)
 					if (debug)
 						addlog("magic glitch ");
 #if defined(__DragonFly__)
-					sp->lcp.magic = random();
+					sp->lcp.magic = krandom();
 #else
 					sp->lcp.magic = time.tv_sec + time.tv_usec;
 #endif
@@ -2797,7 +2797,7 @@ sppp_lcp_scr(struct sppp *sp)
 	if (sp->lcp.opts & (1 << LCP_OPT_MAGIC)) {
 		if (! sp->lcp.magic)
 #if defined(__DragonFly__)
-			sp->lcp.magic = random();
+			sp->lcp.magic = krandom();
 #else
 			sp->lcp.magic = time.tv_sec + time.tv_usec;
 #endif
@@ -4303,7 +4303,7 @@ sppp_chap_tlu(struct sppp *sp)
 		 * Compute the re-challenge timeout.  This will yield
 		 * a number between 300 and 810 seconds.
 		 */
-		i = 300 + ((unsigned)(random() & 0xff00) >> 7);
+		i = 300 + ((unsigned)(krandom() & 0xff00) >> 7);
 		callout_reset(&sp->timeout[IDX_CHAP], i * hz, chap.TO, sp);
 	}
 
@@ -4373,10 +4373,10 @@ sppp_chap_scr(struct sppp *sp)
 	seed = tv.tv_sec ^ tv.tv_usec;
 	}
 #endif
-	ch[0] = seed ^ random();
-	ch[1] = seed ^ random();
-	ch[2] = seed ^ random();
-	ch[3] = seed ^ random();
+	ch[0] = seed ^ krandom();
+	ch[1] = seed ^ krandom();
+	ch[2] = seed ^ krandom();
+	ch[3] = seed ^ krandom();
 	clen = AUTHKEYLEN;
 
 	sp->confid[IDX_CHAP] = ++sp->pp_seq[IDX_CHAP];
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index d47da86240..2ed8e5b2ed 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -36,7 +36,7 @@
  *
  *	from: @(#)igmp_var.h	8.1 (Berkeley) 7/19/93
  * $FreeBSD: src/sys/netinet/igmp_var.h,v 1.17 1999/12/29 04:40:59 peter Exp $
- * $DragonFly: src/sys/netinet/igmp_var.h,v 1.5 2006/05/20 02:42:12 dillon Exp $
+ * $DragonFly: src/sys/netinet/igmp_var.h,v 1.6 2006/09/03 18:52:29 dillon Exp $
  */
 
 #ifndef _NETINET_IGMP_VAR_H_
@@ -76,7 +76,7 @@ struct igmpstat {
 };
 
 #ifdef _KERNEL
-#define IGMP_RANDOM_DELAY(X) (random() % (X) + 1)
+#define IGMP_RANDOM_DELAY(X) (krandom() % (X) + 1)
 
 /*
  * States for IGMPv2's leave processing
diff --git a/sys/netinet6/esp_output.c b/sys/netinet6/esp_output.c
index 22662dd8e4..96a121dfa8 100644
--- a/sys/netinet6/esp_output.c
+++ b/sys/netinet6/esp_output.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/esp_output.c,v 1.1.2.4 2003/05/06 06:46:58 suz Exp $	*/
-/*	$DragonFly: src/sys/netinet6/esp_output.c,v 1.7 2006/05/01 16:27:35 dillon Exp $	*/
+/*	$DragonFly: src/sys/netinet6/esp_output.c,v 1.8 2006/09/03 18:52:29 dillon Exp $	*/
 /*	$KAME: esp_output.c,v 1.44 2001/07/26 06:53:15 jinmei Exp $	*/
 
 /*
@@ -453,7 +453,7 @@ esp_output(struct mbuf *m, u_char *nexthdrp, struct mbuf *md,
 		n = (randpadmax - plen + extendsiz) / padbound;
 
 		if (n > 0)
-			n = (random() % n) * padbound;
+			n = (krandom() % n) * padbound;
 		else
 			n = 0;
 
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index 5b74145bf1..955406ca1d 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/frag6.c,v 1.2.2.6 2002/04/28 05:40:26 suz Exp $	*/
-/*	$DragonFly: src/sys/netinet6/frag6.c,v 1.8 2005/06/03 19:56:08 eirikn Exp $	*/
+/*	$DragonFly: src/sys/netinet6/frag6.c,v 1.9 2006/09/03 18:52:29 dillon Exp $	*/
 /*	$KAME: frag6.c,v 1.33 2002/01/07 11:34:48 kjc Exp $	*/
 
 /*
@@ -91,7 +91,7 @@ frag6_init(void)
 	 * as initialization during bootstrap time occur in fixed order.
 	 */
 	microtime(&tv);
-	ip6_id = random() ^ tv.tv_usec;
+	ip6_id = krandom() ^ tv.tv_usec;
 	ip6q.ip6q_next = ip6q.ip6q_prev = &ip6q;
 }
 
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index a393914c66..bfaf503bca 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.2.2.6 2002/04/28 05:40:26 suz Exp $	*/
-/*	$DragonFly: src/sys/netinet6/in6_ifattach.c,v 1.15 2006/09/03 18:29:17 dillon Exp $	*/
+/*	$DragonFly: src/sys/netinet6/in6_ifattach.c,v 1.16 2006/09/03 18:52:29 dillon Exp $	*/
 /*	$KAME: in6_ifattach.c,v 1.118 2001/05/24 07:44:00 itojun Exp $	*/
 
 /*
@@ -148,7 +148,7 @@ generate_tmp_ifid(u_int8_t *seed0, const u_int8_t *seed1, u_int8_t *ret)
 
 		for (i = 0; i < 2; i++) {
 			microtime(&tv);
-			val32 = random() ^ tv.tv_usec;
+			val32 = krandom() ^ tv.tv_usec;
 			bcopy(&val32, seed + sizeof(val32) * i, sizeof(val32));
 		}
 	} else {
@@ -192,7 +192,7 @@ generate_tmp_ifid(u_int8_t *seed0, const u_int8_t *seed1, u_int8_t *ret)
 		    "generate_tmp_ifid: computed MD5 value is zero.\n");
 
 		microtime(&tv);
-		val32 = random() ^ tv.tv_usec;
+		val32 = krandom() ^ tv.tv_usec;
 		val32 = 1 + (val32 % (0xffffffff - 1));
 	}
 
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 19572eccc7..2803d04f65 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/ip6_input.c,v 1.11.2.15 2003/01/24 05:11:35 sam Exp $	*/
-/*	$DragonFly: src/sys/netinet6/ip6_input.c,v 1.28 2006/05/20 06:32:41 dillon Exp $	*/
+/*	$DragonFly: src/sys/netinet6/ip6_input.c,v 1.29 2006/09/03 18:52:29 dillon Exp $	*/
 /*	$KAME: ip6_input.c,v 1.259 2002/01/21 04:58:09 jinmei Exp $	*/
 
 /*
@@ -206,9 +206,9 @@ ip6_init(void)
 	 * as initialization during bootstrap time occur in fixed order.
 	 */
 	microtime(&tv);
-	ip6_flow_seq = random() ^ tv.tv_usec;
+	ip6_flow_seq = krandom() ^ tv.tv_usec;
 	microtime(&tv);
-	ip6_desync_factor = (random() ^ tv.tv_usec) % MAX_TEMP_DESYNC_FACTOR;
+	ip6_desync_factor = (krandom() ^ tv.tv_usec) % MAX_TEMP_DESYNC_FACTOR;
 }
 
 static void
diff --git a/sys/netinet6/mld6_var.h b/sys/netinet6/mld6_var.h
index 7c61b777ca..d4d1ce2401 100644
--- a/sys/netinet6/mld6_var.h
+++ b/sys/netinet6/mld6_var.h
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/mld6_var.h,v 1.1.2.1 2000/07/15 07:14:36 kris Exp $	*/
-/*	$DragonFly: src/sys/netinet6/mld6_var.h,v 1.4 2006/05/20 02:42:12 dillon Exp $	*/
+/*	$DragonFly: src/sys/netinet6/mld6_var.h,v 1.5 2006/09/03 18:52:29 dillon Exp $	*/
 /*	$KAME: mld6_var.h,v 1.4 2000/03/25 07:23:54 sumikawa Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
 
 #ifdef _KERNEL
 
-#define MLD6_RANDOM_DELAY(X) (random() % (X) + 1)
+#define MLD6_RANDOM_DELAY(X) (krandom() % (X) + 1)
 
 /*
  * States for MLD stop-listening processing
diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h
index 12eb0680e7..b1de8ea701 100644
--- a/sys/netinet6/nd6.h
+++ b/sys/netinet6/nd6.h
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/nd6.h,v 1.2.2.5 2002/04/28 05:40:27 suz Exp $	*/
-/*	$DragonFly: src/sys/netinet6/nd6.h,v 1.7 2006/05/20 02:42:12 dillon Exp $	*/
+/*	$DragonFly: src/sys/netinet6/nd6.h,v 1.8 2006/09/03 18:52:29 dillon Exp $	*/
 /*	$KAME: nd6.h,v 1.76 2001/12/18 02:10:31 itojun Exp $	*/
 
 /*
@@ -228,7 +228,7 @@ struct	in6_ndifreq {
 #define TEMPADDR_REGEN_ADVANCE		5	/* sec */
 #define MAX_TEMP_DESYNC_FACTOR		600	/* 10 min */
 #define ND_COMPUTE_RTIME(x) \
-		(((MIN_RANDOM_FACTOR * (x >> 10)) + (random() & \
+		(((MIN_RANDOM_FACTOR * (x >> 10)) + (krandom() & \
 		((MAX_RANDOM_FACTOR - MIN_RANDOM_FACTOR) * (x >> 10)))) /1000)
 
 TAILQ_HEAD(nd_drhead, nd_defrouter);
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index ce62c8627b..96a0c627aa 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netinet6/nd6_nbr.c,v 1.4.2.6 2003/01/23 21:06:47 sam Exp $	*/
-/*	$DragonFly: src/sys/netinet6/nd6_nbr.c,v 1.13 2006/09/03 18:29:17 dillon Exp $	*/
+/*	$DragonFly: src/sys/netinet6/nd6_nbr.c,v 1.14 2006/09/03 18:52:29 dillon Exp $	*/
 /*	$KAME: nd6_nbr.c,v 1.86 2002/01/21 02:33:04 jinmei Exp $	*/
 
 /*
@@ -1094,9 +1094,9 @@ nd6_dad_start(struct ifaddr *ifa,
 		int ntick;
 
 		if (*tick == 0)
-			ntick = random() % (MAX_RTR_SOLICITATION_DELAY * hz);
+			ntick = krandom() % (MAX_RTR_SOLICITATION_DELAY * hz);
 		else
-			ntick = *tick + random() % (hz / 2);
+			ntick = *tick + krandom() % (hz / 2);
 		*tick = ntick;
 		nd6_dad_starttimer(dp, ntick);
 	}
diff --git a/sys/netproto/ipsec/key.c b/sys/netproto/ipsec/key.c
index 77860b94fb..416bb2ac7d 100644
--- a/sys/netproto/ipsec/key.c
+++ b/sys/netproto/ipsec/key.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netipsec/key.c,v 1.3.2.1 2003/01/24 05:11:35 sam Exp $	*/
-/*	$DragonFly: src/sys/netproto/ipsec/key.c,v 1.14 2006/01/14 13:36:40 swildner Exp $	*/
+/*	$DragonFly: src/sys/netproto/ipsec/key.c,v 1.15 2006/09/03 18:52:29 dillon Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 
 /*
@@ -4194,7 +4194,7 @@ key_timehandler(void *unused)
 static void
 key_srandom(void)
 {
-	srandom(time_second);
+	skrandom(time_second);
 }
 
 u_long
@@ -4217,7 +4217,7 @@ key_randomfill(void *p, size_t l)
 	n = (size_t)read_random(p, (u_int)l);
 	/* last resort */
 	while (n < l) {
-		v = random();
+		v = krandom();
 		bcopy(&v, (u_int8_t *)p + n,
 		    l - n < sizeof(v) ? l - n : sizeof(v));
 		n += sizeof(v);
diff --git a/sys/netproto/key/key.c b/sys/netproto/key/key.c
index c8cf8d4c05..a720b77180 100644
--- a/sys/netproto/key/key.c
+++ b/sys/netproto/key/key.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netkey/key.c,v 1.16.2.13 2002/07/24 18:17:40 ume Exp $	*/
-/*	$DragonFly: src/sys/netproto/key/key.c,v 1.16 2006/03/29 23:17:16 joerg Exp $	*/
+/*	$DragonFly: src/sys/netproto/key/key.c,v 1.17 2006/09/03 18:52:29 dillon Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 
 /*
@@ -4349,7 +4349,7 @@ key_srandom(void)
 
 	microtime(&tv);
 
-	srandom(tv.tv_usec);
+	skrandom(tv.tv_usec);
 
 	return;
 }
@@ -4374,7 +4374,7 @@ key_randomfill(void *p, size_t l)
 	n = (size_t)read_random(p, (u_int)l);
 	/* last resort */
 	while (n < l) {
-		v = random();
+		v = krandom();
 		bcopy(&v, (u_int8_t *)p + n,
 		    l - n < sizeof(v) ? l - n : sizeof(v));
 		n += sizeof(v);
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index 484ab81452..16e7113c38 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -32,7 +32,7 @@
  *
  *	@(#)libkern.h	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/sys/libkern.h,v 1.20.2.2 2001/09/30 21:12:54 luigi Exp $
- * $DragonFly: src/sys/sys/libkern.h,v 1.9 2006/09/03 17:31:55 dillon Exp $
+ * $DragonFly: src/sys/sys/libkern.h,v 1.10 2006/09/03 18:52:29 dillon Exp $
  */
 
 #ifndef _SYS_LIBKERN_H_
@@ -84,12 +84,12 @@ int	 fls (int);
 int	 locc (int, char *, u_int);
 void	 qsort (void *base, size_t nmemb, size_t size,
 		    int (*compar)(const void *, const void *));
-u_long	 random (void);
+u_long	 krandom (void);
 char	*index (const char *, int);
 char	*rindex (const char *, int);
 int	 scanc (u_int, const u_char *, const u_char *, int);
 int	 skpc (int, int, char *);
-void	 srandom (u_long);
+void	 skrandom (u_long);
 char	*strcat (char * __restrict, const char * __restrict);
 int	 strcmp (const char *, const char *);
 char	*strcpy (char * __restrict, const char * __restrict);
diff --git a/sys/vfs/gnu/ext2fs/ext2_alloc.c b/sys/vfs/gnu/ext2fs/ext2_alloc.c
index 614ec9ebb3..2318f76f1d 100644
--- a/sys/vfs/gnu/ext2fs/ext2_alloc.c
+++ b/sys/vfs/gnu/ext2fs/ext2_alloc.c
@@ -38,7 +38,7 @@
  *
  *	@(#)ext2_alloc.c	8.8 (Berkeley) 2/21/94
  * $FreeBSD: src/sys/gnu/ext2fs/ext2_alloc.c,v 1.28.2.2 2002/07/01 00:18:51 iedowse Exp $
- * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_alloc.c,v 1.11 2006/04/04 17:34:32 dillon Exp $
+ * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_alloc.c,v 1.12 2006/09/03 18:52:29 dillon Exp $
  */
 
 #include "opt_quota.h"
@@ -419,7 +419,7 @@ ext2_valloc(struct vnode *pvp, int mode, struct ucred *cred, struct vnode **vpp)
 	 * XXX check if this makes sense in ext2
 	 */
 	if (ip->i_gen == 0 || ++ip->i_gen == 0)
-		ip->i_gen = random() / 2 + 1;
+		ip->i_gen = krandom() / 2 + 1;
 /*
 printf("ext2_valloc: allocated inode %d\n", ino);
 */
diff --git a/sys/vfs/gnu/ext2fs/ext2_vfsops.c b/sys/vfs/gnu/ext2fs/ext2_vfsops.c
index cb6cb490e8..72aa756afa 100644
--- a/sys/vfs/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/vfs/gnu/ext2fs/ext2_vfsops.c
@@ -38,7 +38,7 @@
  *
  *	@(#)ffs_vfsops.c	8.8 (Berkeley) 4/18/94
  *	$FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.63.2.7 2002/07/01 00:18:51 iedowse Exp $
- *	$DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vfsops.c,v 1.47 2006/08/12 00:26:20 dillon Exp $
+ *	$DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vfsops.c,v 1.48 2006/09/03 18:52:29 dillon Exp $
  */
 
 #include "opt_quota.h"
@@ -1184,7 +1184,7 @@ printf("ext2_vget(%d) dbn= %d ", ino, fsbtodb(fs, ino_to_fsba(fs, ino)));
 	 * already have one. This should only happen on old filesystems.
 	 */
 	if (ip->i_gen == 0) {
-		ip->i_gen = random() / 2 + 1;
+		ip->i_gen = krandom() / 2 + 1;
 		if ((vp->v_mount->mnt_flag & MNT_RDONLY) == 0)
 			ip->i_flag |= IN_MODIFIED;
 	}
diff --git a/sys/vfs/msdosfs/msdosfs_fat.c b/sys/vfs/msdosfs/msdosfs_fat.c
index 35176e0521..bed7c57391 100644
--- a/sys/vfs/msdosfs/msdosfs_fat.c
+++ b/sys/vfs/msdosfs/msdosfs_fat.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/msdosfs/msdosfs_fat.c,v 1.23 2000/01/27 14:43:06 nyan Exp $ */
-/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_fat.c,v 1.9 2006/03/24 22:39:22 dillon Exp $ */
+/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_fat.c,v 1.10 2006/09/03 18:52:30 dillon Exp $ */
 /*	$NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $	*/
 
 /*-
@@ -756,7 +756,7 @@ clusteralloc(struct msdosfsmount *pmp, u_long start, u_long count,
 	 * Start at a (pseudo) random place to maximize cluster runs
 	 * under multiple writers.
 	 */
-	newst = random() % (pmp->pm_maxcluster + 1);
+	newst = krandom() % (pmp->pm_maxcluster + 1);
 	foundl = 0;
 
 	for (cn = newst; cn <= pmp->pm_maxcluster;) {
diff --git a/sys/vfs/nfs/nfs_subs.c b/sys/vfs/nfs/nfs_subs.c
index 6c55a929ad..aedd5338d5 100644
--- a/sys/vfs/nfs/nfs_subs.c
+++ b/sys/vfs/nfs/nfs_subs.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
  * $FreeBSD: /repoman/r/ncvs/src/sys/nfsclient/nfs_subs.c,v 1.128 2004/04/14 23:23:55 peadar Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_subs.c,v 1.41 2006/08/12 00:26:21 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_subs.c,v 1.42 2006/09/03 18:52:30 dillon Exp $
  */
 
 /*
@@ -626,7 +626,7 @@ nfsm_rpchead(struct ucred *cr, int nmflag, int procid, int auth_type,
 
 	/* Get a pretty random xid to start with */
 	if (!nfs_xid) 
-		nfs_xid = random();
+		nfs_xid = krandom();
 	/*
 	 * Skip zero xid if it should ever happen.
 	 */
diff --git a/sys/vfs/ufs/ffs_alloc.c b/sys/vfs/ufs/ffs_alloc.c
index 3cd62dc941..c896adceac 100644
--- a/sys/vfs/ufs/ffs_alloc.c
+++ b/sys/vfs/ufs/ffs_alloc.c
@@ -32,7 +32,7 @@
  *
  *	@(#)ffs_alloc.c	8.18 (Berkeley) 5/26/95
  * $FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.64.2.2 2001/09/21 19:15:21 dillon Exp $
- * $DragonFly: src/sys/vfs/ufs/ffs_alloc.c,v 1.23 2006/09/03 17:31:55 dillon Exp $
+ * $DragonFly: src/sys/vfs/ufs/ffs_alloc.c,v 1.24 2006/09/03 18:52:30 dillon Exp $
  */
 
 #include "opt_quota.h"
@@ -635,7 +635,7 @@ ffs_valloc(struct vnode *pvp, int mode, struct ucred *cred, struct vnode **vpp)
 	 * Set up a new generation number for this inode.
 	 */
 	if (ip->i_gen == 0 || ++ip->i_gen == 0)
-		ip->i_gen = random() / 2 + 1;
+		ip->i_gen = krandom() / 2 + 1;
 	return (0);
 noinodes:
 	ffs_fserr(fs, cred->cr_uid, "out of inodes");
diff --git a/sys/vfs/ufs/ffs_vfsops.c b/sys/vfs/ufs/ffs_vfsops.c
index 130166f640..15537260c6 100644
--- a/sys/vfs/ufs/ffs_vfsops.c
+++ b/sys/vfs/ufs/ffs_vfsops.c
@@ -32,7 +32,7 @@
  *
  *	@(#)ffs_vfsops.c	8.31 (Berkeley) 5/20/95
  * $FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.117.2.10 2002/06/23 22:34:52 iedowse Exp $
- * $DragonFly: src/sys/vfs/ufs/ffs_vfsops.c,v 1.47 2006/08/12 00:26:21 dillon Exp $
+ * $DragonFly: src/sys/vfs/ufs/ffs_vfsops.c,v 1.48 2006/09/03 18:52:30 dillon Exp $
  */
 
 #include "opt_quota.h"
@@ -1158,7 +1158,7 @@ restart:
 	 * already have one. This should only happen on old filesystems.
 	 */
 	if (ip->i_gen == 0) {
-		ip->i_gen = random() / 2 + 1;
+		ip->i_gen = krandom() / 2 + 1;
 		if ((vp->v_mount->mnt_flag & MNT_RDONLY) == 0)
 			ip->i_flag |= IN_MODIFIED;
 	}
-- 
2.41.0