Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/xen/xen Make sure to call xbdback_trampoline() at s...
details: https://anonhg.NetBSD.org/src/rev/5f580843a385
branches: trunk
changeset: 767958:5f580843a385
user: bouyer <bouyer%NetBSD.org@localhost>
date: Thu Aug 04 18:01:49 2011 +0000
description:
Make sure to call xbdback_trampoline() at splbio()
diffstat:
sys/arch/xen/xen/xbdback_xenbus.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diffs (40 lines):
diff -r b90a44dc29d9 -r 5f580843a385 sys/arch/xen/xen/xbdback_xenbus.c
--- a/sys/arch/xen/xen/xbdback_xenbus.c Thu Aug 04 17:48:50 2011 +0000
+++ b/sys/arch/xen/xen/xbdback_xenbus.c Thu Aug 04 18:01:49 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdback_xenbus.c,v 1.41 2011/07/24 23:56:34 jym Exp $ */
+/* $NetBSD: xbdback_xenbus.c,v 1.42 2011/08/04 18:01:49 bouyer Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.41 2011/07/24 23:56:34 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.42 2011/08/04 18:01:49 bouyer Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1657,19 +1657,17 @@
case 0:
xbd_io->xio_mapped = 1;
SIMPLEQ_REMOVE_HEAD(&xbdback_shmq, xbdi_on_hold);
- splx(s);
+ (void)splbio();
xbdback_trampoline(xbdi, xbdi);
- s = splvm();
break;
default:
SIMPLEQ_REMOVE_HEAD(&xbdback_shmq, xbdi_on_hold);
- splx(s);
+ (void)splbio();
printf("xbdback_shm_callback: xen_shm error %d\n",
error);
xbdi->xbdi_cont = xbdi->xbdi_cont_aux;
xbdback_io_error(xbd_io, error);
xbdback_trampoline(xbdi, xbdi);
- s = splvm();
break;
}
}
Home |
Main Index |
Thread Index |
Old Index