Page MenuHomeFreeBSD
Files F152675201

D40279.id122558.diff
No OneTemporary
Actions

D40279.id122558.diff
View Options

Index: sys/dev/hyperv/vmbus/vmbus.c
===================================================================
--- sys/dev/hyperv/vmbus/vmbus.c
+++ sys/dev/hyperv/vmbus/vmbus.c
@@ -113,7 +113,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
@@ -1488,7 +1488,7 @@
{
}
-#if defined(EARLY_AP_STARTUP) || defined(__aarch64__)
+#if defined(EARLY_AP_STARTUP)
static void
vmbus_intrhook(void *xsc)
@@ -1501,7 +1501,7 @@
config_intrhook_disestablish(&sc->vmbus_intrhook);
}
-#endif /* EARLY_AP_STARTUP aarch64 */
+#endif /* EARLY_AP_STARTUP */
static int
vmbus_attach(device_t dev)
@@ -1517,22 +1517,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);
@@ -1578,7 +1569,7 @@
return (0);
}
-#if !defined(EARLY_AP_STARTUP) && !defined(__aarch64__)
+#if !defined(EARLY_AP_STARTUP)
static void
vmbus_sysinit(void *arg __unused)
@@ -1587,15 +1578,8 @@
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
Fri, Apr 17, 11:11 AM (19 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31656285
Default Alt Text
D40279.id122558.diff (2 KB)

Event Timeline