Module Name: src
Committed By: snj
Date: Sun Oct 4 00:00:14 UTC 2009
Modified Files:
src/sys/arch/xen/xen [netbsd-5]: xpci_xenbus.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1054):
sys/arch/xen/xen/xpci_xenbus.c: revision 1.2
Don't emulate a cold boot here, this breaks drivers using config_interrupt().
To generate a diff of this commit:
cvs rdiff -u -r1.2.6.2 -r1.2.6.3 src/sys/arch/xen/xen/xpci_xenbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/xpci_xenbus.c
diff -u src/sys/arch/xen/xen/xpci_xenbus.c:1.2.6.2 src/sys/arch/xen/xen/xpci_xenbus.c:1.2.6.3
--- src/sys/arch/xen/xen/xpci_xenbus.c:1.2.6.2 Sat Oct 3 23:54:05 2009
+++ src/sys/arch/xen/xen/xpci_xenbus.c Sun Oct 4 00:00:14 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xpci_xenbus.c,v 1.2.6.2 2009/10/03 23:54:05 snj Exp $ */
+/* $NetBSD: xpci_xenbus.c,v 1.2.6.3 2009/10/04 00:00:14 snj Exp $ */
/*
* Copyright (c) 2009 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.2.6.2 2009/10/03 23:54:05 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.2.6.3 2009/10/04 00:00:14 snj Exp $");
#include "opt_xen.h"
#include "rnd.h"
@@ -336,7 +336,7 @@
char node[10];
u_long busn;
int i;
- int s, oldcold;
+ int s;
err = xenbus_read_ul(NULL, sc->sc_xbusd->xbusd_otherend,
"root_num", &num_roots, 10);
@@ -372,10 +372,7 @@
"%s is not a number\n", bus);
else {
s = splhigh();
- oldcold = cold;
- cold = 1;
xpci_attach_pcibus(0, busn);
- cold = oldcold;
splx(s);
}
}
