Page MenuHomeFreeBSD
Files F164629011

D40279.id122912.diff
No OneTemporary
Actions

D40279.id122912.diff
View Options

diff --git a/sys/dev/hyperv/vmbus/vmbus.c b/sys/dev/hyperv/vmbus/vmbus.c
--- a/sys/dev/hyperv/vmbus/vmbus.c
+++ b/sys/dev/hyperv/vmbus/vmbus.c
@@ -114,7 +114,7 @@
device_t dev, int cpu);
static struct taskqueue *vmbus_get_eventtq_method(device_t, device_t,
int);
-#if defined(EARLY_AP_STARTUP) || defined(__aarch64__)
+#if defined(EARLY_AP_STARTUP)
static void vmbus_intrhook(void *);
#endif
@@ -1482,7 +1482,7 @@
{
}
-#if defined(EARLY_AP_STARTUP) || defined(__aarch64__)
+#if defined(EARLY_AP_STARTUP)
static void
vmbus_intrhook(void *xsc)
@@ -1495,7 +1495,7 @@
config_intrhook_disestablish(&sc->vmbus_intrhook);
}
-#endif /* EARLY_AP_STARTUP aarch64 */
+#endif /* EARLY_AP_STARTUP */
static int
vmbus_attach(device_t dev)
@@ -1511,22 +1511,13 @@
*/
vmbus_sc->vmbus_event_proc = vmbus_event_proc_dummy;
-#if defined(EARLY_AP_STARTUP) || defined(__aarch64__)
+#if defined(EARLY_AP_STARTUP)
/*
* Defer the real attach until the pause(9) works as expected.
*/
vmbus_sc->vmbus_intrhook.ich_func = vmbus_intrhook;
vmbus_sc->vmbus_intrhook.ich_arg = vmbus_sc;
config_intrhook_establish(&vmbus_sc->vmbus_intrhook);
-#else /* !EARLY_AP_STARTUP */
- /*
- * If the system has already booted and thread
- * scheduling is possible indicated by the global
- * cold set to zero, we just call the driver
- * initialization directly.
- */
- if (!cold)
- vmbus_doattach(vmbus_sc);
#endif /* EARLY_AP_STARTUP and aarch64 */
return (0);
@@ -1572,7 +1563,7 @@
return (0);
}
-#if !defined(EARLY_AP_STARTUP) && !defined(__aarch64__)
+#if !defined(EARLY_AP_STARTUP)
static void
vmbus_sysinit(void *arg __unused)
@@ -1582,14 +1573,7 @@
if (vm_guest != VM_GUEST_HV || sc == NULL)
return;
- /*
- * If the system has already booted and thread
- * scheduling is possible, as indicated by the
- * global cold set to zero, we just call the driver
- * initialization directly.
- */
- if (!cold)
- vmbus_doattach(sc);
+ vmbus_doattach(sc);
}
/*
* NOTE:

File Metadata

Mime Type
text/plain
Expires
Mon, Aug 3, 4:35 PM (16 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35892444
Default Alt Text
D40279.id122912.diff (1 KB)

Event Timeline