---

yaml --- r: 212229 b: refs/heads/master c: 9717967 h: refs/heads/master i: 212227: 7b2cf96 v: v3
git-mirror · Oct 19, 2010 · d3917ec · d3917ec
1 parent 09b5df2
commit d3917ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 032fa36091a925f555158f4e80f8a09d951cdb10
+refs/heads/master: 9717967c4b704ce344c954afb5bb160aa9c01c34
diff --git a/trunk/arch/x86/kernel/apic/io_apic.c b/trunk/arch/x86/kernel/apic/io_apic.c
@@ -3109,7 +3109,8 @@ void destroy_irq(unsigned int irq)
 
 	irq_set_status_flags(irq, IRQ_NOREQUEST|IRQ_NOPROBE);
 
-	free_irte(irq);
+	if (intr_remapping_enabled)
+		free_irte(irq);
 	raw_spin_lock_irqsave(&vector_lock, flags);
 	__clear_irq_vector(irq, cfg);
 	raw_spin_unlock_irqrestore(&vector_lock, flags);