From d3917ec5641927f96967c5376c31043e2fc2ac6e Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Mon, 18 Oct 2010 13:47:48 -0700
Subject: [PATCH] --- yaml --- r: 212229 b: refs/heads/master c:
 9717967c4b704ce344c954afb5bb160aa9c01c34 h: refs/heads/master i:   212227:
 7b2cf967b12337149b72e143af579f108e2c7ddf v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/kernel/apic/io_apic.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f0fc9d0f5a66..7eb06099f5d4 100644
--- 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
index 20e47e045395..8ae808d110f4 100644
--- 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);