D7363.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7363.diff
View Options

	Index: head/sys/x86/x86/intr_machdep.c
	===================================================================
	--- head/sys/x86/x86/intr_machdep.c
	+++ head/sys/x86/x86/intr_machdep.c
	@@ -197,28 +197,19 @@
	intr_remove_handler(void *cookie)
	{
	struct intsrc *isrc;
	- int error, mtx_owned;
	+ int error;

	isrc = intr_handler_source(cookie);
	error = intr_event_remove_handler(cookie);
	if (error == 0) {
	- /*
	- * Recursion is needed here so PICs can remove interrupts
	- * while resuming. It was previously not possible due to
	- * intr_resume holding the intr_table_lock and
	- * intr_remove_handler recursing on it.
	- */
	- mtx_owned = mtx_owned(&intr_table_lock);
	- if (mtx_owned == 0)
	- mtx_lock(&intr_table_lock);
	+ mtx_lock(&intr_table_lock);
	isrc->is_handlers--;
	if (isrc->is_handlers == 0) {
	isrc->is_pic->pic_disable_source(isrc, PIC_NO_EOI);
	isrc->is_pic->pic_disable_intr(isrc);
	}
	intrcnt_updatename(isrc);
	- if (mtx_owned == 0)
	- mtx_unlock(&intr_table_lock);
	+ mtx_unlock(&intr_table_lock);
	}
	return (error);
	}