D36901.id111537.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D36901.id111537.diff
View Options

	diff --git a/sys/x86/include/intr_machdep.h b/sys/x86/include/intr_machdep.h
	--- a/sys/x86/include/intr_machdep.h
	+++ b/sys/x86/include/intr_machdep.h
	@@ -142,9 +142,6 @@
	int intr_add_handler(const char name, struct intsrc isrc,
	driver_filter_t filter, driver_intr_t handler, void *arg,
	enum intr_type flags, void **cookiep, int domain);
	-#ifdef SMP
	-int intr_bind(struct intsrc *isrc, u_char cpu);
	-#endif
	int intr_config_intr(struct intsrc *isrc, enum intr_trigger trig,
	enum intr_polarity pol);
	int intr_describe(struct intsrc isrc, void ih, const char *descr);
	diff --git a/sys/x86/x86/intr_machdep.c b/sys/x86/x86/intr_machdep.c
	--- a/sys/x86/x86/intr_machdep.c
	+++ b/sys/x86/x86/intr_machdep.c
	@@ -616,14 +616,6 @@
	return (apic_id);
	}

	-/* Attempt to bind the specified IRQ to the specified CPU. */
	-int
	-intr_bind(struct intsrc *isrc, u_char cpu)
	-{
	-
	- return (intr_event_bind(isrc->is_event, cpu));
	-}
	-
	/*
	* Add a CPU to our mask of valid CPUs that can be destinations of
	* interrupts.
	diff --git a/sys/x86/x86/nexus.c b/sys/x86/x86/nexus.c
	--- a/sys/x86/x86/nexus.c
	+++ b/sys/x86/x86/nexus.c
	@@ -639,7 +639,7 @@
	isrc = intr_lookup_source(rman_get_start(irq));
	if (isrc == NULL)
	return (EINVAL);
	- return (intr_bind(isrc, cpu));
	+ return (intr_event_bind(isrc->is_event, cpu));
	}
	#endif