summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'tags/2.6.21-2/20966_linux-2.6-xen-fix-irq-warn-mismerge.patch')
-rw-r--r--tags/2.6.21-2/20966_linux-2.6-xen-fix-irq-warn-mismerge.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/tags/2.6.21-2/20966_linux-2.6-xen-fix-irq-warn-mismerge.patch b/tags/2.6.21-2/20966_linux-2.6-xen-fix-irq-warn-mismerge.patch
new file mode 100644
index 0000000..7220996
--- /dev/null
+++ b/tags/2.6.21-2/20966_linux-2.6-xen-fix-irq-warn-mismerge.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User ehabkost@localhost.localdomain
+# Date 1192026477 10800
+# Node ID b24c00d1fb598b75c87fc76879082f3cb535bd92
+# Parent b3725a59160f28b2fa1a68b12512a06dcf3ffaae
+Fix mismerge from changeset 7968bef2c9af
+
+That WARN_ON() is supposed to be on free_irq(), not synchronize_irq().
+
+Index: linux-2.6.21.i386/kernel/irq/manage.c
+===================================================================
+--- linux-2.6.21.i386.orig/kernel/irq/manage.c
++++ linux-2.6.21.i386/kernel/irq/manage.c
+@@ -30,7 +30,6 @@ void synchronize_irq(unsigned int irq)
+ {
+ struct irq_desc *desc = irq_desc + irq;
+
+- WARN_ON(in_interrupt());
+ if (irq >= NR_IRQS)
+ return;
+