Author: hselasky
Date: Fri Sep 23 08:41:18 2016
New Revision: 306255
URL: https://svnweb.freebsd.org/changeset/base/306255
Log:
MFC r305804:
Make the callout structure in the boot loader's kernel shim more
similar to the kernel one.
Modified:
stable/11/sys/boot/kshim/bsd_kernel.c
stable/11/sys/boot/kshim/bsd_kernel.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/boot/kshim/bsd_kernel.c
==============================================================================
--- stable/11/sys/boot/kshim/bsd_kernel.c Fri Sep 23 08:35:56 2016
(r306254)
+++ stable/11/sys/boot/kshim/bsd_kernel.c Fri Sep 23 08:41:18 2016
(r306255)
@@ -432,8 +432,8 @@ callout_callback(struct callout *c)
}
mtx_unlock(&mtx_callout);
- if (c->func)
- (c->func) (c->arg);
+ if (c->c_func != NULL)
+ (c->c_func) (c->c_arg);
if (!(c->flags & CALLOUT_RETURNUNLOCKED))
mtx_unlock(c->mtx);
@@ -487,8 +487,8 @@ callout_reset(struct callout *c, int to_
{
callout_stop(c);
- c->func = func;
- c->arg = arg;
+ c->c_func = func;
+ c->c_arg = arg;
c->timeout = ticks + to_ticks;
mtx_lock(&mtx_callout);
@@ -507,8 +507,8 @@ callout_stop(struct callout *c)
}
mtx_unlock(&mtx_callout);
- c->func = NULL;
- c->arg = NULL;
+ c->c_func = NULL;
+ c->c_arg = NULL;
}
void
Modified: stable/11/sys/boot/kshim/bsd_kernel.h
==============================================================================
--- stable/11/sys/boot/kshim/bsd_kernel.h Fri Sep 23 08:35:56 2016
(r306254)
+++ stable/11/sys/boot/kshim/bsd_kernel.h Fri Sep 23 08:41:18 2016
(r306255)
@@ -299,8 +299,8 @@ extern volatile int ticks;
struct callout {
LIST_ENTRY(callout) entry;
- callout_fn_t *func;
- void *arg;
+ callout_fn_t *c_func;
+ void *c_arg;
struct mtx *mtx;
int flags;
int timeout;
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
