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

Commit a3a9f3b4 authored by Yong Zhang's avatar Yong Zhang Committed by Benjamin Herrenschmidt
Browse files

powerpc/irq: Remove IRQF_DISABLED 



Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],
We run all interrupt handlers with interrupts disabled
and we even check and yell when an interrupt handler
returns with interrupts enabled (see commit [b738a50a:
genirq: Warn when handler enables interrupts]).

So now this flag is a NOOP and can be removed.

Signed-off-by: default avatarYong Zhang <yong.zhang0@gmail.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarGeoff Levand <geoff@infradead.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 1c8ee733

arch/powerpc/include/asm/floppy.h

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

	if (can_use_virtual_dma)

		return request_irq(FLOPPY_IRQ, floppy_hardint,

				   IRQF_DISABLED, "floppy", NULL);

				   0, "floppy", NULL);

	else

		return request_irq(FLOPPY_IRQ, floppy_interrupt,

				   IRQF_DISABLED, "floppy", NULL);

				   0, "floppy", NULL);

}



static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io)

arch/powerpc/include/asm/xics.h

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
#define	DEFAULT_PRIORITY	5



/*

 * Mark IPIs as higher priority so we can take them inside interrupts that

 * arent marked IRQF_DISABLED

 * Mark IPIs as higher priority so we can take them inside interrupts

 * FIXME: still true now?

 */

#define IPI_PRIORITY		4

arch/powerpc/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ int smp_request_message_ipi(int virq, int msg) 
		return 1;

	}

#endif

	err = request_irq(virq, smp_ipi_action[msg], IRQF_DISABLED|IRQF_PERCPU,

	err = request_irq(virq, smp_ipi_action[msg], IRQF_PERCPU,

			  smp_ipi_name[msg], 0);

	WARN(err < 0, "unable to request_irq %d for %s (rc %d)\n",

		virq, smp_ipi_name[msg], err);

arch/powerpc/platforms/cell/beat.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static int __init beat_register_event(void) 
		}

		ev->virq = virq;



		rc = request_irq(virq, ev->handler, IRQF_DISABLED,

		rc = request_irq(virq, ev->handler, 0,

				      ev->typecode, NULL);

		if (rc != 0) {

			printk(KERN_ERR "Beat: failed to request virtual IRQ"

arch/powerpc/platforms/cell/celleb_scc_pciex.c

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ static __init int celleb_setup_pciex(struct device_node *node, 
	virq = irq_create_of_mapping(oirq.controller, oirq.specifier,

				     oirq.size);

	if (request_irq(virq, pciex_handle_internal_irq,

			IRQF_DISABLED, "pciex", (void *)phb)) {

			0, "pciex", (void *)phb)) {

		pr_err("PCIEXC:Failed to request irq\n");

		goto error;

	}