diff options
| author | hselasky <hselasky@FreeBSD.org> | 2016-09-23 08:41:18 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2016-09-23 08:41:18 +0000 |
| commit | 770fd2290bb6cf4a2d04e3565c90a4ca036bf546 (patch) | |
| tree | a11f385571bea3a488c677a9f43196297f6f0c42 /sys/boot/kshim/bsd_kernel.c | |
| parent | bd8e82a7baddaea8d11e204d6053bc9b833039a2 (diff) | |
| download | FreeBSD-src-770fd2290bb6cf4a2d04e3565c90a4ca036bf546.zip FreeBSD-src-770fd2290bb6cf4a2d04e3565c90a4ca036bf546.tar.gz | |
MFC r305804:
Make the callout structure in the boot loader's kernel shim more
similar to the kernel one.
Diffstat (limited to 'sys/boot/kshim/bsd_kernel.c')
| -rw-r--r-- | sys/boot/kshim/bsd_kernel.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/boot/kshim/bsd_kernel.c b/sys/boot/kshim/bsd_kernel.c index ccdec49..36a6d82 100644 --- a/sys/boot/kshim/bsd_kernel.c +++ b/sys/boot/kshim/bsd_kernel.c @@ -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_ticks, { 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 |
