PERFORCE change 36144 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=36144

Change 36144 by sam at sam_ebb on 2003/08/14 15:08:14

	replace instances of
		callout_init(..., 1)
	with
		callout_init(..., CALLOUT_MPSAFE);
	which has the same effect but makes it clear what the intent is.

Affected files ...

.. //depot/projects/netperf/sys/dev/hifn/hifn7751.c#2 edit
.. //depot/projects/netperf/sys/dev/patm/if_patm_attach.c#2 edit
.. //depot/projects/netperf/sys/dev/rndtest/rndtest.c#2 edit
.. //depot/projects/netperf/sys/dev/safe/safe.c#2 edit
.. //depot/projects/netperf/sys/dev/ubsec/ubsec.c#2 edit
.. //depot/projects/netperf/sys/kern/init_main.c#2 edit
.. //depot/projects/netperf/sys/kern/kern_fork.c#3 edit
.. //depot/projects/netperf/sys/kern/kern_synch.c#2 edit
.. //depot/projects/netperf/sys/kern/sched_4bsd.c#2 edit
.. //depot/projects/netperf/sys/kern/sched_ule.c#2 edit
.. //depot/projects/netperf/sys/net/bpf.c#3 edit
.. //depot/projects/netperf/sys/netinet/tcp_syncache.c#2 edit

Differences ...

==== //depot/projects/netperf/sys/dev/hifn/hifn7751.c#2 (text+ko) ====

@@ -487,8 +487,7 @@
 	if (sc->sc_flags & (HIFN_HAS_PUBLIC | HIFN_HAS_RNG))
 		hifn_init_pubrng(sc);
 
-	/* NB: 1 means the callout runs w/o Giant locked */
-	callout_init(&sc->sc_tickto, 1);
+	callout_init(&sc->sc_tickto, CALLOUT_MPSAFE);
 	callout_reset(&sc->sc_tickto, hz, hifn_tick, sc);
 
 	return (0);
@@ -687,8 +686,7 @@
 			sc->sc_rnghz = hz / 100;
 		else
 			sc->sc_rnghz = 1;
-		/* NB: 1 means the callout runs w/o Giant locked */
-		callout_init(&sc->sc_rngto, 1);
+		callout_init(&sc->sc_rngto, CALLUOT_MPSAFE);
 		callout_reset(&sc->sc_rngto, sc->sc_rnghz, hifn_rng, sc);
 	}
 

==== //depot/projects/netperf/sys/dev/patm/if_patm_attach.c#2 (text+ko) ====

@@ -204,7 +204,7 @@
 	mtx_init(&sc->tst_lock, "tst lock", NULL, MTX_DEF);
 	cv_init(&sc->vcc_cv, "vcc_close");
 
-	callout_init(&sc->tst_callout, 1);
+	callout_init(&sc->tst_callout, CALLOUT_MPSAFE);
 
 	sysctl_ctx_init(&sc->sysctl_ctx);
 

==== //depot/projects/netperf/sys/dev/rndtest/rndtest.c#2 (text+ko) ====

@@ -96,8 +96,7 @@
 #if __FreeBSD_version < 500000
 		callout_init(&rsp->rs_to);
 #else
-		/* NB: 1 means the callout runs w/o Giant locked */
-		callout_init(&rsp->rs_to, 1);
+		callout_init(&rsp->rs_to, CALLOUT_MPSAFE);
 #endif
 	} else
 		device_printf(dev, "rndtest_init: no memory for state block\n");

==== //depot/projects/netperf/sys/dev/safe/safe.c#2 (text+ko) ====

@@ -441,8 +441,7 @@
 #endif
 		safe_rng_init(sc);
 
-		/* NB: 1 means the callout runs w/o Giant locked */
-		callout_init(&sc->sc_rngto, 1);
+		callout_init(&sc->sc_rngto, CALLOUT_MPSAFE);
 		callout_reset(&sc->sc_rngto, hz*safe_rnginterval, safe_rng, sc);
 	}
 #endif /* SAFE_NO_RNG */

==== //depot/projects/netperf/sys/dev/ubsec/ubsec.c#2 (text+ko) ====

@@ -462,8 +462,7 @@
 			sc->sc_rnghz = hz / 100;
 		else
 			sc->sc_rnghz = 1;
-		/* NB: 1 means the callout runs w/o Giant locked */
-		callout_init(&sc->sc_rngto, 1);
+		callout_init(&sc->sc_rngto, CALLOUT_MPSAFE);
 		callout_reset(&sc->sc_rngto, sc->sc_rnghz, ubsec_rng, sc);
 skip_rng:
 	;

==== //depot/projects/netperf/sys/kern/init_main.c#2 (text+ko) ====

@@ -386,8 +386,8 @@
 
 	bcopy("swapper", p->p_comm, sizeof ("swapper"));
 
-	callout_init(&p->p_itcallout, 1);
-	callout_init(&td->td_slpcallout, 1);
+	callout_init(&p->p_itcallout, CALLOUT_MPSAFE);
+	callout_init(&td->td_slpcallout, CALLOUT_MPSAFE);
 
 	/* Create credentials. */
 	p->p_ucred = crget();

==== //depot/projects/netperf/sys/kern/kern_fork.c#3 (text+ko) ====

@@ -594,7 +594,7 @@
 	PGRP_UNLOCK(p1->p_pgrp);
 	LIST_INIT(&p2->p_children);
 
-	callout_init(&p2->p_itcallout, 1);
+	callout_init(&p2->p_itcallout, CALLOUT_MPSAFE);
 
 #ifdef KTRACE
 	/*

==== //depot/projects/netperf/sys/kern/kern_synch.c#2 (text+ko) ====

@@ -659,7 +659,7 @@
 	void *dummy;
 {
 	callout_init(&loadav_callout, 0);
-	callout_init(&lbolt_callout, 1);
+	callout_init(&lbolt_callout, CALLOUT_MPSAFE);
 
 	/* Kick off timeout driven events by calling first time. */
 	loadav(NULL);

==== //depot/projects/netperf/sys/kern/sched_4bsd.c#2 (text+ko) ====

@@ -399,7 +399,7 @@
 		sched_quantum = SCHED_QUANTUM;
 	hogticks = 2 * sched_quantum;
 
-	callout_init(&schedcpu_callout, 1);
+	callout_init(&schedcpu_callout, CALLOUT_MPSAFE);
 	callout_init(&roundrobin_callout, 0);
 
 	/* Kick off timeout driven events by calling first time. */

==== //depot/projects/netperf/sys/kern/sched_ule.c#2 (text+ko) ====

@@ -569,7 +569,7 @@
 			kseq_cpu[i].ksq_cpus = cg->cg_count;
 		}
 	}
-	callout_init(&kseq_lb_callout, 1);
+	callout_init(&kseq_lb_callout, CALLOUT_MPSAFE);
 	kseq_balance(NULL);
 #else
 	kseq_setup(KSEQ_SELF());

==== //depot/projects/netperf/sys/net/bpf.c#3 (text+ko) ====

@@ -355,7 +355,7 @@
 	mac_create_bpfdesc(td->td_ucred, d);
 #endif
 	mtx_init(&d->bd_mtx, devtoname(dev), "bpf cdev lock", MTX_DEF);
-	callout_init(&d->bd_callout, 1);
+	callout_init(&d->bd_callout, CALLOUT_MPSAFE);
 
 	return (0);
 }

==== //depot/projects/netperf/sys/netinet/tcp_syncache.c#2 (text+ko) ====

@@ -258,7 +258,7 @@
 	/* Initialize the timer queues. */
 	for (i = 0; i <= SYNCACHE_MAXREXMTS; i++) {
 		TAILQ_INIT(&tcp_syncache.timerq[i]);
-		callout_init(&tcp_syncache.tt_timerq[i], 1);
+		callout_init(&tcp_syncache.tt_timerq[i], CALLOUT_MPSAFE);
 	}
 
 	/*