D7348.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7348.diff
View Options

	Index: head/sys/dev/hyperv/vmbus/vmbus.c
	===================================================================
	--- head/sys/dev/hyperv/vmbus/vmbus.c
	+++ head/sys/dev/hyperv/vmbus/vmbus.c
	@@ -125,7 +125,7 @@
	static struct vmbus_msghc vmbus_msghc_get1(struct vmbus_msghc_ctx ,
	uint32_t);

	-struct vmbus_softc *vmbus_sc;
	+static struct vmbus_softc *vmbus_sc;

	extern inthand_t IDTVEC(vmbus_isr);

	@@ -176,6 +176,12 @@
	MODULE_DEPEND(vmbus, acpi, 1, 1, 1);
	MODULE_VERSION(vmbus, 1);

	+static __inline struct vmbus_softc *
	+vmbus_get_softc(void)
	+{
	+ return vmbus_sc;
	+}
	+
	static struct vmbus_msghc *
	vmbus_msghc_alloc(bus_dma_tag_t parent_dtag)
	{
	Index: head/sys/dev/hyperv/vmbus/vmbus_var.h
	===================================================================
	--- head/sys/dev/hyperv/vmbus/vmbus_var.h
	+++ head/sys/dev/hyperv/vmbus/vmbus_var.h
	@@ -120,20 +120,6 @@
	#define VMBUS_FLAG_ATTACHED 0x0001 /* vmbus was attached */
	#define VMBUS_FLAG_SYNIC 0x0002 /* SynIC was setup */

	-extern struct vmbus_softc *vmbus_sc;
	-
	-static __inline struct vmbus_softc *
	-vmbus_get_softc(void)
	-{
	- return vmbus_sc;
	-}
	-
	-static __inline device_t
	-vmbus_get_device(void)
	-{
	- return vmbus_sc->vmbus_dev;
	-}
	-
	#define VMBUS_PCPU_GET(sc, field, cpu) (sc)->vmbus_pcpu[(cpu)].field
	#define VMBUS_PCPU_PTR(sc, field, cpu) &(sc)->vmbus_pcpu[(cpu)].field