Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-8]: src/sys/arch/xen/xen Apply patch, requested by manu in ticket...
details: https://anonhg.NetBSD.org/src/rev/a77581a43452
branches: netbsd-8
changeset: 435272:a77581a43452
user: martin <martin%NetBSD.org@localhost>
date: Sun Sep 23 17:58:51 2018 +0000
description:
Apply patch, requested by manu in ticket #1034:
Avoid sleeping with a spin lock held (solved differently on HEAD).
diffstat:
sys/arch/xen/xen/xbdback_xenbus.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diffs (39 lines):
diff -r 3634032db4e1 -r a77581a43452 sys/arch/xen/xen/xbdback_xenbus.c
--- a/sys/arch/xen/xen/xbdback_xenbus.c Sun Sep 23 17:51:09 2018 +0000
+++ b/sys/arch/xen/xen/xbdback_xenbus.c Sun Sep 23 17:58:51 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdback_xenbus.c,v 1.63 2016/12/26 08:16:28 skrll Exp $ */
+/* $NetBSD: xbdback_xenbus.c,v 1.63.8.1 2018/09/23 17:58:51 martin Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.63 2016/12/26 08:16:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.63.8.1 2018/09/23 17:58:51 martin Exp $");
#include <sys/atomic.h>
#include <sys/buf.h>
@@ -674,15 +674,16 @@
static void
xbdback_disconnect(struct xbdback_instance *xbdi)
{
-
+
+ hypervisor_mask_event(xbdi->xbdi_evtchn);
+ event_remove_handler(xbdi->xbdi_evtchn, xbdback_evthandler,
+ xbdi);
+
mutex_enter(&xbdi->xbdi_lock);
if (xbdi->xbdi_status == DISCONNECTED) {
mutex_exit(&xbdi->xbdi_lock);
return;
}
- hypervisor_mask_event(xbdi->xbdi_evtchn);
- event_remove_handler(xbdi->xbdi_evtchn, xbdback_evthandler,
- xbdi);
/* signal thread that we want to disconnect, then wait for it */
xbdi->xbdi_status = DISCONNECTING;
Home |
Main Index |
Thread Index |
Old Index