Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d20d2efb authored by Michael Opdenacker's avatar Michael Opdenacker Committed by Thomas Gleixner
Browse files

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: default avatarMichael 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: default avatarThomas Gleixner <tglx@linutronix.de>
parent 322a126a

arch/x86/include/asm/floppy.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -145,10 +145,10 @@ static int fd_request_irq(void) 
{

{

	if (can_use_virtual_dma)

	if (can_use_virtual_dma)

		return request_irq(FLOPPY_IRQ, floppy_hardint,

		return request_irq(FLOPPY_IRQ, floppy_hardint,

				   IRQF_DISABLED, "floppy", NULL);

				   0, "floppy", NULL);

	else

	else

		return request_irq(FLOPPY_IRQ, floppy_interrupt,

		return request_irq(FLOPPY_IRQ, floppy_interrupt,

				   IRQF_DISABLED, "floppy", NULL);

				   0, "floppy", NULL);

}

}





static unsigned long dma_mem_alloc(unsigned long size)

static unsigned long dma_mem_alloc(unsigned long size)

arch/x86/kernel/hpet.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -521,7 +521,7 @@ static int hpet_setup_irq(struct hpet_dev *dev) 
{

{





	if (request_irq(dev->irq, hpet_interrupt_handler,

	if (request_irq(dev->irq, hpet_interrupt_handler,

			IRQF_TIMER | IRQF_DISABLED | IRQF_NOBALANCING,

			IRQF_TIMER | IRQF_NOBALANCING,

			dev->name, dev))

			dev->name, dev))

		return -1;

		return -1;

arch/x86/kernel/time.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id) 




static struct irqaction irq0  = {

static struct irqaction irq0  = {

	.handler = timer_interrupt,

	.handler = timer_interrupt,

	.flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL | IRQF_TIMER,

	.flags = IRQF_NOBALANCING | IRQF_IRQPOLL | IRQF_TIMER,

	.name = "timer"

	.name = "timer"

};

};