]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86: HPET: enter hpet_interrupt_handler with interrupts disabled
authorMatt Fleming <mjf@gentoo.org>
Sun, 2 Nov 2008 22:23:13 +0000 (22:23 +0000)
committerThomas Gleixner <tglx@apollo.(none)>
Mon, 10 Nov 2008 16:38:07 +0000 (17:38 +0100)
Some functions that may be called from this handler require that
interrupts are disabled. Also, combining IRQF_DISABLED and
IRQF_SHARED does not reliably disable interrupts in a handler, so
remove IRQF_SHARED from the irq flags (this irq is not shared anyway).

Signed-off-by: Matt Fleming <mjf@gentoo.org>
Cc: mingo@elte.hu
Cc: venkatesh.pallipadi@intel.com
Cc: "Will Newton" <will.newton@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/kernel/hpet.c

index cfe6aa56f71b390af770d1c204b4c4e6749fdff4..067d8de913f612d45018090a1fae4e5cc920462f 100644 (file)
@@ -445,7 +445,7 @@ static int hpet_setup_irq(struct hpet_dev *dev)
 {
 
        if (request_irq(dev->irq, hpet_interrupt_handler,
-                       IRQF_SHARED|IRQF_NOBALANCING, dev->name, dev))
+                       IRQF_DISABLED|IRQF_NOBALANCING, dev->name, dev))
                return -1;
 
        disable_irq(dev->irq);