diff options
| author | hrs <hrs@FreeBSD.org> | 2011-06-11 06:56:26 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2011-06-11 06:56:26 +0000 |
| commit | b2a6f5600367e61c439c79db2317d4619960e2ce (patch) | |
| tree | b813a06aa0583761055c631f2a5c54ae5943b77b /sys/dev/xen/control/control.c | |
| parent | d4f481b2900357dc1f0d48b9f4e052a920909b02 (diff) | |
| parent | c8e3d11e24e29c032a1ed9d46c65d8f10e9f0030 (diff) | |
| download | FreeBSD-src-b2a6f5600367e61c439c79db2317d4619960e2ce.zip FreeBSD-src-b2a6f5600367e61c439c79db2317d4619960e2ce.tar.gz | |
Merge from HEAD@222975.
Diffstat (limited to 'sys/dev/xen/control/control.c')
| -rw-r--r-- | sys/dev/xen/control/control.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c index 0f44181..bc59fa0 100644 --- a/sys/dev/xen/control/control.c +++ b/sys/dev/xen/control/control.c @@ -173,8 +173,6 @@ static struct xctrl_shutdown_reason xctrl_shutdown_reasons[] = { }; struct xctrl_softc { - - /** Must be first */ struct xs_watch xctrl_watch; }; @@ -450,6 +448,7 @@ xctrl_attach(device_t dev) /* Activate watch */ xctrl->xctrl_watch.node = "control/shutdown"; xctrl->xctrl_watch.callback = xctrl_on_watch_event; + xctrl->xctrl_watch.callback_data = (uintptr_t)xctrl; xs_register_watch(&xctrl->xctrl_watch); #ifndef XENHVM |
