rpms/kernel-xen-2.6/devel linux-2.6-xen-fix-irq-warn-mismerge.patch, NONE, 1.1 kernel-xen.spec, 1.64, 1.65

[Eduardo Habkost (ehabkost)]

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16357

Modified Files:
	kernel-xen.spec 
Added Files:
	linux-2.6-xen-fix-irq-warn-mismerge.patch 
Log Message:
Remove bogus WARN_ON() from synchronize_irq() (bug #293451)


linux-2.6-xen-fix-irq-warn-mismerge.patch:

--- NEW FILE linux-2.6-xen-fix-irq-warn-mismerge.patch ---
# HG changeset patch
# User ehabkost at 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;
 


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- kernel-xen.spec	8 Oct 2007 13:42:25 -0000	1.64
+++ kernel-xen.spec	10 Oct 2007 15:27:48 -0000	1.65
@@ -473,6 +473,9 @@
 # Fix VM_PFNMAP BUG_ON()
 Patch965: linux-2.6-xen-privcmd-use-nopfn.patch
 
+# Remove bogus WARN_ON() from synchronize_irq() (bug #293451)
+Patch966: linux-2.6-xen-fix-irq-warn-mismerge.patch
+
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
 #
@@ -964,6 +967,7 @@
 %patch963 -p1
 %patch964 -p1
 %patch965 -p1
+%patch966 -p1
 %endif
 
 
@@ -2370,6 +2374,9 @@
 #  - tux.
 
 %changelog
+* Wed Oct 10 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Remove bogus WARN_ON() from synchronize_irq() (bug #293451)
+
 * Mon Oct 08 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Add patch to fix BUG_ON() Oops caused by privcmd (bug #323031)