rpms/kernel/F-7 linux-2.6-irq-dont-mask-interrupts-_reversed_.patch, 1.1, 1.2
Chuck Ebbert (cebbert)
fedora-extras-commits at redhat.com
Fri Jul 27 17:57:17 UTC 2007
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27839
Modified Files:
linux-2.6-irq-dont-mask-interrupts-_reversed_.patch
Log Message:
IRQ revert needed another patch reversed.
linux-2.6-irq-dont-mask-interrupts-_reversed_.patch:
Index: linux-2.6-irq-dont-mask-interrupts-_reversed_.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-irq-dont-mask-interrupts-_reversed_.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-irq-dont-mask-interrupts-_reversed_.patch 27 Jul 2007 16:55:26 -0000 1.1
+++ linux-2.6-irq-dont-mask-interrupts-_reversed_.patch 27 Jul 2007 17:57:15 -0000 1.2
@@ -2,6 +2,93 @@
# HG changeset patch
# User Ingo Molnar <mingo at elte.hu>
# Date 1171642440 28800
+# Node ID 2d4f86005ca6d0066cea2f23f7aa42ea4c697375
+# Parent d1b0c83033a40869b74878c5808b93f134a367de
+[PATCH] genirq: remove IRQ_DISABLED
+
+Now that disable_irq() defaults to delayed-disable semantics, the IRQ_DISABLED
+flag is not needed anymore.
+
+Signed-off-by: Ingo Molnar <mingo at elte.hu>
+Cc: Thomas Gleixner <tglx at linutronix.de>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+
+committer: Linus Torvalds <torvalds at woody.linux-foundation.org>
+
+--- a/arch/arm/kernel/irq.c Fri Feb 16 08:14:00 2007 -0800
++++ b/arch/arm/kernel/irq.c Fri Feb 16 08:14:00 2007 -0800
+@@ -159,8 +159,7 @@ void __init init_IRQ(void)
+ int irq;
+
+ for (irq = 0; irq < NR_IRQS; irq++)
+- irq_desc[irq].status |= IRQ_NOREQUEST | IRQ_DELAYED_DISABLE |
+- IRQ_NOPROBE;
++ irq_desc[irq].status |= IRQ_NOREQUEST | IRQ_NOPROBE;
+
+ #ifdef CONFIG_SMP
+ bad_irq_desc.affinity = CPU_MASK_ALL;
+--- a/arch/i386/kernel/io_apic.c Fri Feb 16 08:14:00 2007 -0800
++++ b/arch/i386/kernel/io_apic.c Fri Feb 16 08:14:00 2007 -0800
+@@ -1281,11 +1281,9 @@ static void ioapic_register_intr(int irq
+ trigger == IOAPIC_LEVEL)
+ set_irq_chip_and_handler_name(irq, &ioapic_chip,
+ handle_fasteoi_irq, "fasteoi");
+- else {
+- irq_desc[irq].status |= IRQ_DELAYED_DISABLE;
++ else
+ set_irq_chip_and_handler_name(irq, &ioapic_chip,
+ handle_edge_irq, "edge");
+- }
+ set_intr_gate(vector, interrupt[irq]);
+ }
+
+--- a/arch/powerpc/platforms/powermac/pic.c Fri Feb 16 08:14:00 2007 -0800
++++ b/arch/powerpc/platforms/powermac/pic.c Fri Feb 16 08:14:00 2007 -0800
+@@ -305,8 +305,6 @@ static int pmac_pic_host_map(struct irq_
+ level = !!(level_mask[hw >> 5] & (1UL << (hw & 0x1f)));
+ if (level)
+ desc->status |= IRQ_LEVEL;
+- else
+- desc->status |= IRQ_DELAYED_DISABLE;
+ set_irq_chip_and_handler(virq, &pmac_pic, level ?
+ handle_level_irq : handle_edge_irq);
+ return 0;
+--- a/arch/x86_64/kernel/io_apic.c Fri Feb 16 08:14:00 2007 -0800
++++ b/arch/x86_64/kernel/io_apic.c Fri Feb 16 08:14:00 2007 -0800
+@@ -810,11 +810,9 @@ static void ioapic_register_intr(int irq
+ if (trigger)
+ set_irq_chip_and_handler_name(irq, &ioapic_chip,
+ handle_fasteoi_irq, "fasteoi");
+- else {
+- irq_desc[irq].status |= IRQ_DELAYED_DISABLE;
++ else
+ set_irq_chip_and_handler_name(irq, &ioapic_chip,
+ handle_edge_irq, "edge");
+- }
+ }
+
+ static void setup_IO_APIC_irq(int apic, int pin, unsigned int irq,
+--- a/include/linux/irq.h Fri Feb 16 08:14:00 2007 -0800
++++ b/include/linux/irq.h Fri Feb 16 08:14:00 2007 -0800
+@@ -57,10 +57,9 @@ typedef void fastcall (*irq_flow_handler
+ #define IRQ_NOPROBE 0x00020000 /* IRQ is not valid for probing */
+ #define IRQ_NOREQUEST 0x00040000 /* IRQ cannot be requested */
+ #define IRQ_NOAUTOEN 0x00080000 /* IRQ will not be enabled on request irq */
+-#define IRQ_DELAYED_DISABLE 0x00100000 /* IRQ disable (masking) happens delayed. */
+-#define IRQ_WAKEUP 0x00200000 /* IRQ triggers system wakeup */
+-#define IRQ_MOVE_PENDING 0x00400000 /* need to re-target IRQ destination */
+-#define IRQ_NO_BALANCING 0x00800000 /* IRQ is excluded from balancing */
++#define IRQ_WAKEUP 0x00100000 /* IRQ triggers system wakeup */
++#define IRQ_MOVE_PENDING 0x00200000 /* need to re-target IRQ destination */
++#define IRQ_NO_BALANCING 0x00400000 /* IRQ is excluded from balancing */
+
+ #ifdef CONFIG_IRQ_PER_CPU
+ # define CHECK_IRQ_PER_CPU(var) ((var) & IRQ_PER_CPU)
+
+# HG changeset patch
+# User Ingo Molnar <mingo at elte.hu>
+# Date 1171642440 28800
# Node ID d1b0c83033a40869b74878c5808b93f134a367de
# Parent 2585c4c9e72258a5d948969968316f07be5cbddb
[PATCH] genirq: do not mask interrupts by default
More information about the scm-commits
mailing list