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

Commit 4879d77c authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] irq-flags: i386: Use the new IRQF_ constants 



Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b98d3396

arch/i386/mach-default/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ void __init trap_init_hook(void) 
{

}



static struct irqaction irq0  = { timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL};

static struct irqaction irq0  = { timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL};



/**

 * time_init_hook - do any specific initialisations for the system timer.

arch/i386/mach-visws/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ void __init pre_setup_arch_hook() 


static struct irqaction irq0 = {

	.handler =	timer_interrupt,

	.flags =	SA_INTERRUPT,

	.flags =	IRQF_DISABLED,

	.name =		"timer",

};

arch/i386/mach-voyager/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ void __init trap_init_hook(void) 
{

}



static struct irqaction irq0  = { timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL};

static struct irqaction irq0  = { timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL};



void __init time_init_hook(void)

{

arch/i386/pci/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -864,7 +864,7 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign) 
		for (i = 0; i < 16; i++) {

			if (!(mask & (1 << i)))

				continue;

			if (pirq_penalty[i] < pirq_penalty[newirq] && can_request_irq(i, SA_SHIRQ))

			if (pirq_penalty[i] < pirq_penalty[newirq] && can_request_irq(i, IRQF_SHARED))

				newirq = i;

		}

	}

include/asm-i386/floppy.h

+4 −4
Original line number Diff line number Diff line
@@ -144,11 +144,11 @@ static int vdma_get_dma_residue(unsigned int dummy) 
static int fd_request_irq(void)

{

	if(can_use_virtual_dma)

		return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,

						   "floppy", NULL);

		return request_irq(FLOPPY_IRQ, floppy_hardint,

				   IRQF_DISABLED, "floppy", NULL);

	else

		return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT,

				   "floppy", NULL);

		return request_irq(FLOPPY_IRQ, floppy_interrupt,

				   IRQF_DISABLED, "floppy", NULL);



}