Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86: Remove deprecated IRQF_DISABLED

This patch removes the IRQF_DISABLED flag from x86 architecture
code. It's a NOOP since 2.6.35 and it will be removed one day.

Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Cc: venki@google.com
Link: http://lkml.kernel.org/r/1393965305-17248-1-git-send-email-michael.opdenacker@free-electrons.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

authored by

Michael Opdenacker and committed by
Thomas Gleixner
d20d2efb 322a126a

+4 -4
+2 -2
arch/x86/include/asm/floppy.h
··· 145 145 { 146 146 if (can_use_virtual_dma) 147 147 return request_irq(FLOPPY_IRQ, floppy_hardint, 148 - IRQF_DISABLED, "floppy", NULL); 148 + 0, "floppy", NULL); 149 149 else 150 150 return request_irq(FLOPPY_IRQ, floppy_interrupt, 151 - IRQF_DISABLED, "floppy", NULL); 151 + 0, "floppy", NULL); 152 152 } 153 153 154 154 static unsigned long dma_mem_alloc(unsigned long size)
+1 -1
arch/x86/kernel/hpet.c
··· 521 521 { 522 522 523 523 if (request_irq(dev->irq, hpet_interrupt_handler, 524 - IRQF_TIMER | IRQF_DISABLED | IRQF_NOBALANCING, 524 + IRQF_TIMER | IRQF_NOBALANCING, 525 525 dev->name, dev)) 526 526 return -1; 527 527
+1 -1
arch/x86/kernel/time.c
··· 62 62 63 63 static struct irqaction irq0 = { 64 64 .handler = timer_interrupt, 65 - .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL | IRQF_TIMER, 65 + .flags = IRQF_NOBALANCING | IRQF_IRQPOLL | IRQF_TIMER, 66 66 .name = "timer" 67 67 }; 68 68