diff options
| author | Matt Fleming <mjf@gentoo.org> | 2008-11-02 22:23:13 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@apollo.(none)> | 2008-11-10 17:38:07 +0100 |
| commit | 5ceb1a04187553e08c6ab60d30cee7c454ee139a (patch) | |
| tree | 8ce801cf81aa3fae8c73788312c8cd75cb99bf49 /arch | |
| parent | 89d77a1eb60be916d85d9394bedbfa2037af89c5 (diff) | |
| download | linux-stable-5ceb1a04187553e08c6ab60d30cee7c454ee139a.tar.gz linux-stable-5ceb1a04187553e08c6ab60d30cee7c454ee139a.tar.bz2 linux-stable-5ceb1a04187553e08c6ab60d30cee7c454ee139a.zip | |
x86: HPET: enter hpet_interrupt_handler with interrupts disabled
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/hpet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index cfe6aa56f71b..067d8de913f6 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -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); |