d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the definition and implementation of 'CALLOUT_NETGIANT', a now- (and

Browse Source 
possibly always-) unused define.

Reported by:	kmacy
Approved by:	re (kensmith)
This commit is contained in:
Robert Watson 2007-09-15 12:33:24 +00:00
parent 1d506d2013
commit dce5df0dfc
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/kern/kern_timeout.c
View File

@ -238,13 +238,6 @@ softclock(void *dummy)
curr_cancelled = 0;
mtx_unlock_spin(&callout_lock);
if (c_mtx != NULL) {
if (c_flags & CALLOUT_NETGIANT) {
mtx_lock(&Giant);
gcalls++;
CTR3(KTR_CALLOUT, "netgiant"
" %p func %p arg %p",
c, c_func, c_arg);
}
mtx_lock(c_mtx);
/*
* The callout may have been cancelled
@ -299,8 +292,6 @@ softclock(void *dummy)
#endif
if ((c_flags & CALLOUT_RETURNUNLOCKED) == 0)
mtx_unlock(c_mtx);
if (c_flags & CALLOUT_NETGIANT)
mtx_unlock(&Giant);
skip:
mtx_lock_spin(&callout_lock);
curr_callout = NULL;
@ -639,12 +630,12 @@ callout_init_mtx(c, mtx, flags)
{
bzero(c, sizeof *c);
c->c_mtx = mtx;
KASSERT((flags & ~(CALLOUT_RETURNUNLOCKED|CALLOUT_NETGIANT)) == 0,
KASSERT((flags & ~(CALLOUT_RETURNUNLOCKED)) == 0,
("callout_init_mtx: bad flags %d", flags));
/* CALLOUT_RETURNUNLOCKED makes no sense without a mutex. */
KASSERT(mtx != NULL || (flags & CALLOUT_RETURNUNLOCKED) == 0,
("callout_init_mtx: CALLOUT_RETURNUNLOCKED with no mutex"));
c->c_flags = flags & (CALLOUT_RETURNUNLOCKED|CALLOUT_NETGIANT);
c->c_flags = flags & (CALLOUT_RETURNUNLOCKED);
}
#ifdef APM_FIXUP_CALLTODO

1
sys/sys/callout.h
View File

@ -62,7 +62,6 @@ struct callout {
#define CALLOUT_PENDING 0x0004 /* callout is waiting for timeout */
#define CALLOUT_MPSAFE 0x0008 /* callout handler is mp safe */
#define CALLOUT_RETURNUNLOCKED 0x0010 /* handler returns with mtx unlocked */
#define CALLOUT_NETGIANT 0x0020 /* XXX: obtain Giant before mutex */
struct callout_handle {
struct callout *callout;