Date: Wed, 3 Nov 2004 18:12:55 +0300 From: Gleb Smirnoff <glebius@freebsd.org> To: Vincent Poy <vincepoy@gmail.com> Cc: freebsd-current@freebsd.org Subject: Re: -CURRENT kernel build fails Message-ID: <20041103151255.GE2312@cell.sick.ru> In-Reply-To: <429af92e0411022120361dfee7@mail.gmail.com> References: <429af92e0411022034133d9c1a@mail.gmail.com> <429af92e0411022120361dfee7@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--i0/AhcQY5QxfSsSZ
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
On Tue, Nov 02, 2004 at 09:20:01PM -0800, Vincent Poy wrote:
V> On Tue, 2 Nov 2004 20:34:21 -0800, Vincent Poy <vincepoy@gmail.com> wrote:
V> > In today's -CURRENT about 5:00PM -800, my GENERIC kernel build fails
V> > at the following:
And one more I haven't attachd to previous mail.
--
Totus tuus, Glebius.
GLEBIUS-RIPN GLEB-RIPE
--i0/AhcQY5QxfSsSZ
Content-Type: text/plain; charset=koi8-r
Content-Disposition: attachment; filename="ng_uni_cust.h.diff"
Index: ng_uni_cust.h
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/atm/uni/ng_uni_cust.h,v
retrieving revision 1.2
diff -u -r1.2 ng_uni_cust.h
--- ng_uni_cust.h 25 Jun 2004 19:22:03 -0000 1.2
+++ ng_uni_cust.h 3 Nov 2004 15:08:17 -0000
@@ -79,19 +79,19 @@
* Timers
*/
struct uni_timer {
- struct callout_handle c;
+ struct callout c;
};
-#define _TIMER_INIT(X,T) callout_handle_init(&(X)->T.c)
+#define _TIMER_INIT(X,T) ng_callout_init(&(X)->T.c)
#define _TIMER_DESTROY(UNI,FIELD) _TIMER_STOP(UNI,FIELD)
#define _TIMER_STOP(UNI,FIELD) do { \
- ng_untimeout(FIELD.c, (UNI)->arg); \
- callout_handle_init(&FIELD.c); \
+ ng_untimeout(&FIELD.c, (UNI)->arg); \
} while (0)
-#define TIMER_ISACT(UNI,T) ((UNI)->T.c.callout != NULL)
+#define TIMER_ISACT(UNI,T) ((UNI)->T.c.c_flags & (CALLOUT_ACTIVE | \
+ CALLOUT_PENDING))
#define _TIMER_START(UNI,ARG,FIELD,DUE,FUNC) do { \
_TIMER_STOP(UNI, FIELD); \
- FIELD.c = ng_timeout((UNI)->arg, NULL, \
+ ng_timeout(&FIELD.c, (UNI)->arg, NULL, \
hz * (DUE) / 1000, FUNC, (ARG), 0); \
} while (0)
@@ -102,7 +102,6 @@
{ \
struct uni *uni = (struct uni *)arg1; \
\
- callout_handle_init(&uni->T.c); \
(F)(uni); \
uni_work(uni); \
}
@@ -118,7 +117,6 @@
struct call *call = (struct call *)arg1; \
struct uni *uni = call->uni; \
\
- callout_handle_init(&call->T.c); \
(F)(call); \
uni_work(uni); \
}
@@ -134,7 +132,6 @@
struct party *party = (struct party *)arg1; \
struct uni *uni = party->call->uni; \
\
- callout_handle_init(&party->T.c); \
(F)(party); \
uni_work(uni); \
}
--i0/AhcQY5QxfSsSZ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041103151255.GE2312>