From 2b97747dc3c3633e19cc5ddbc3129b835c83ccb3 Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Tue, 14 Jan 2014 01:41:11 +0000 Subject: [PATCH 25/48] xen/xenpv: Only add isa for x86 architecture isa device doesn't exist on ARM. --- sys/dev/xen/xenpv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/xen/xenpv.c b/sys/dev/xen/xenpv.c index 57ffb5d..19a8397 100644 --- a/sys/dev/xen/xenpv.c +++ b/sys/dev/xen/xenpv.c @@ -69,7 +69,6 @@ xenpv_probe(device_t dev) static int xenpv_attach(device_t dev) { - device_t child; int error; /* Initialize grant table before any Xen specific device is attached */ @@ -88,12 +87,14 @@ xenpv_attach(device_t dev) bus_generic_probe(dev); bus_generic_attach(dev); +#if defined(__i386__) if (!devclass_get_device(devclass_find("isa"), 0)) { - child = BUS_ADD_CHILD(dev, 0, "isa", 0); + device_t child = BUS_ADD_CHILD(dev, 0, "isa", 0); if (child == NULL) panic("Failed to attach ISA bus."); device_probe_and_attach(child); } +#endif return (0); } -- 2.1.0