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

Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas 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: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] irq-flags: POWERPC: Use the new IRQF_ constants
Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas 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: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Thomas Gleixner · Linus Torvalds
1 parent 733ea869e5
Showing 9 changed files with 25 additions and 21 deletions Side-by-side Diff
arch/powerpc/platforms/cell/interrupt.c
arch/powerpc/platforms/cell/spu_base.c
arch/powerpc/platforms/powermac/pic.c
arch/powerpc/platforms/powermac/smp.c
arch/powerpc/platforms/pseries/xics.c
arch/powerpc/sysdev/i8259.c
arch/powerpc/sysdev/mpic.c
include/asm-powerpc/floppy.h
include/asm-powerpc/signal.h
@@ -304,11 +304,11 @@
 	int irq;
  
 	irq = iic_ipi_to_irq(ipi);
-	/* IPIs are marked SA_INTERRUPT as they must run with irqs
+	/* IPIs are marked IRQF_DISABLED as they must run with irqs
 	 * disabled */
 	get_irq_desc(irq)->chip = &iic_pic;
 	get_irq_desc(irq)->status |= IRQ_PER_CPU;
-	request_irq(irq, iic_ipi_action, SA_INTERRUPT, name, NULL);
+	request_irq(irq, iic_ipi_action, IRQF_DISABLED, name, NULL);
 }
  
 void iic_request_IPIs(void)
@@ -274,19 +274,19 @@
  
 	snprintf(spu->irq_c0, sizeof (spu->irq_c0), "spe%02d.0", spu->number);
 	ret = request_irq(irq_base + spu->isrc,
-		 spu_irq_class_0, SA_INTERRUPT, spu->irq_c0, spu);
+		 spu_irq_class_0, IRQF_DISABLED, spu->irq_c0, spu);
 	if (ret)
 		goto out;
  
 	snprintf(spu->irq_c1, sizeof (spu->irq_c1), "spe%02d.1", spu->number);
 	ret = request_irq(irq_base + IIC_CLASS_STRIDE + spu->isrc,
-		 spu_irq_class_1, SA_INTERRUPT, spu->irq_c1, spu);
+		 spu_irq_class_1, IRQF_DISABLED, spu->irq_c1, spu);
 	if (ret)
 		goto out1;
  
 	snprintf(spu->irq_c2, sizeof (spu->irq_c2), "spe%02d.2", spu->number);
 	ret = request_irq(irq_base + 2*IIC_CLASS_STRIDE + spu->isrc,
-		 spu_irq_class_2, SA_INTERRUPT, spu->irq_c2, spu);
+		 spu_irq_class_2, IRQF_DISABLED, spu->irq_c2, spu);
 	if (ret)
 		goto out2;
 	goto out;
@@ -381,7 +381,7 @@
  
 static struct irqaction gatwick_cascade_action = {
 	.handler	= gatwick_action,
-	.flags		= SA_INTERRUPT,
+	.flags		= IRQF_DISABLED,
 	.mask		= CPU_MASK_NONE,
 	.name		= "cascade",
 };
@@ -377,7 +377,7 @@
  
 static struct irqaction psurge_irqaction = {
 	.handler = psurge_primary_intr,
-	.flags = SA_INTERRUPT,
+	.flags = IRQF_DISABLED,
 	.mask = CPU_MASK_NONE,
 	.name = "primary IPI",
 };
@@ -59,7 +59,7 @@
  
 /*
  * Mark IPIs as higher priority so we can take them inside interrupts that
- * arent marked SA_INTERRUPT
+ * arent marked IRQF_DISABLED
  */
 #define IPI_PRIORITY		4
  
@@ -586,9 +586,12 @@
 {
 	virt_irq_to_real_map[XICS_IPI] = XICS_IPI;
  
-	/* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */
-	request_irq(irq_offset_up(XICS_IPI), xics_ipi_action, SA_INTERRUPT,
-		    "IPI", NULL);
+	/*
+	 * IPIs are marked IRQF_DISABLED as they must run with irqs
+	 * disabled
+	 */
+	request_irq(irq_offset_up(XICS_IPI), xics_ipi_action,
+		    IRQF_DISABLED, "IPI", NULL);
 	get_irq_desc(irq_offset_up(XICS_IPI))->status |= IRQ_PER_CPU;
 }
 #endif
@@ -167,7 +167,7 @@
  
 static struct irqaction i8259_irqaction = {
 	.handler = no_action,
-	.flags = SA_INTERRUPT,
+	.flags = IRQF_DISABLED,
 	.mask = CPU_MASK_NONE,
 	.name = "82c59 secondary cascade",
 };
@@ -540,7 +540,7 @@
 	 * IPIs are marked IRQ_PER_CPU. This has the side effect of
 	 * preventing the IRQ_PENDING/IRQ_INPROGRESS logic from
 	 * applying to them. We EOI them late to avoid re-entering.
-	 * We mark IPI's with SA_INTERRUPT as they must run with
+	 * We mark IPI's with IRQF_DISABLED as they must run with
 	 * irqs disabled.
 	 */
 	mpic_eoi(mpic);
  
  
  
@@ -1027,14 +1027,17 @@
  
 	printk("requesting IPIs ... \n");
  
-	/* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */
-	request_irq(mpic->ipi_offset+0, mpic_ipi_action, SA_INTERRUPT,
+	/*
+	 * IPIs are marked IRQF_DISABLED as they must run with irqs
+	 * disabled
+	 */
+	request_irq(mpic->ipi_offset+0, mpic_ipi_action, IRQF_DISABLED,
 		    "IPI0 (call function)", mpic);
-	request_irq(mpic->ipi_offset+1, mpic_ipi_action, SA_INTERRUPT,
+	request_irq(mpic->ipi_offset+1, mpic_ipi_action, IRQF_DISABLED,
 		   "IPI1 (reschedule)", mpic);
-	request_irq(mpic->ipi_offset+2, mpic_ipi_action, SA_INTERRUPT,
+	request_irq(mpic->ipi_offset+2, mpic_ipi_action, IRQF_DISABLED,
 		   "IPI2 (unused)", mpic);
-	request_irq(mpic->ipi_offset+3, mpic_ipi_action, SA_INTERRUPT,
+	request_irq(mpic->ipi_offset+3, mpic_ipi_action, IRQF_DISABLED,
 		   "IPI3 (debugger break)", mpic);
  
 	printk("IPIs requested... \n");
@@ -27,7 +27,7 @@
 #define fd_disable_irq()        disable_irq(FLOPPY_IRQ)
 #define fd_cacheflush(addr,size) /* nothing */
 #define fd_request_irq()        request_irq(FLOPPY_IRQ, floppy_interrupt, \
-					    SA_INTERRUPT, "floppy", NULL)
+					    IRQF_DISABLED, "floppy", NULL)
 #define fd_free_irq()           free_irq(FLOPPY_IRQ, NULL);
  
 #ifdef CONFIG_PCI
@@ -63,7 +63,6 @@
  * SA_FLAGS values:
  *
  * SA_ONSTACK is not currently supported, but will allow sigaltstack(2).
- * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the
  * SA_RESTART flag to get restarting signals (which were the default long ago)
  * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
  * SA_RESETHAND clears the handler when the signal is delivered.
@@ -83,7 +82,6 @@
  
 #define SA_NOMASK	SA_NODEFER
 #define SA_ONESHOT	SA_RESETHAND
-#define SA_INTERRUPT	0x20000000u /* dummy -- ignored */
  
 #define SA_RESTORER	0x04000000U
...	...	@@ -304,11 +304,11 @@
304	304	int irq;
305	305
306	306	irq = iic_ipi_to_irq(ipi);
307		- /* IPIs are marked SA_INTERRUPT as they must run with irqs
	307	+ /* IPIs are marked IRQF_DISABLED as they must run with irqs
308	308	* disabled */
309	309	get_irq_desc(irq)->chip = &iic_pic;
310	310	get_irq_desc(irq)->status \|= IRQ_PER_CPU;
311		- request_irq(irq, iic_ipi_action, SA_INTERRUPT, name, NULL);
	311	+ request_irq(irq, iic_ipi_action, IRQF_DISABLED, name, NULL);
312	312	}
313	313
314	314	void iic_request_IPIs(void)
...	...	@@ -274,19 +274,19 @@
274	274
275	275	snprintf(spu->irq_c0, sizeof (spu->irq_c0), "spe%02d.0", spu->number);
276	276	ret = request_irq(irq_base + spu->isrc,
277		- spu_irq_class_0, SA_INTERRUPT, spu->irq_c0, spu);
	277	+ spu_irq_class_0, IRQF_DISABLED, spu->irq_c0, spu);
278	278	if (ret)
279	279	goto out;
280	280
281	281	snprintf(spu->irq_c1, sizeof (spu->irq_c1), "spe%02d.1", spu->number);
282	282	ret = request_irq(irq_base + IIC_CLASS_STRIDE + spu->isrc,
283		- spu_irq_class_1, SA_INTERRUPT, spu->irq_c1, spu);
	283	+ spu_irq_class_1, IRQF_DISABLED, spu->irq_c1, spu);
284	284	if (ret)
285	285	goto out1;
286	286
287	287	snprintf(spu->irq_c2, sizeof (spu->irq_c2), "spe%02d.2", spu->number);
288	288	ret = request_irq(irq_base + 2*IIC_CLASS_STRIDE + spu->isrc,
289		- spu_irq_class_2, SA_INTERRUPT, spu->irq_c2, spu);
	289	+ spu_irq_class_2, IRQF_DISABLED, spu->irq_c2, spu);
290	290	if (ret)
291	291	goto out2;
292	292	goto out;
...	...	@@ -381,7 +381,7 @@
381	381
382	382	static struct irqaction gatwick_cascade_action = {
383	383	.handler = gatwick_action,
384		- .flags = SA_INTERRUPT,
	384	+ .flags = IRQF_DISABLED,
385	385	.mask = CPU_MASK_NONE,
386	386	.name = "cascade",
387	387	};
...	...	@@ -377,7 +377,7 @@
377	377
378	378	static struct irqaction psurge_irqaction = {
379	379	.handler = psurge_primary_intr,
380		- .flags = SA_INTERRUPT,
	380	+ .flags = IRQF_DISABLED,
381	381	.mask = CPU_MASK_NONE,
382	382	.name = "primary IPI",
383	383	};
...	...	@@ -59,7 +59,7 @@
59	59
60	60	/*
61	61	* Mark IPIs as higher priority so we can take them inside interrupts that
62		- * arent marked SA_INTERRUPT
	62	+ * arent marked IRQF_DISABLED
63	63	*/
64	64	#define IPI_PRIORITY 4
65	65
...	...	@@ -586,9 +586,12 @@
586	586	{
587	587	virt_irq_to_real_map[XICS_IPI] = XICS_IPI;
588	588
589		- /* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */
590		- request_irq(irq_offset_up(XICS_IPI), xics_ipi_action, SA_INTERRUPT,
591		- "IPI", NULL);
	589	+ /*
	590	+ * IPIs are marked IRQF_DISABLED as they must run with irqs
	591	+ * disabled
	592	+ */
	593	+ request_irq(irq_offset_up(XICS_IPI), xics_ipi_action,
	594	+ IRQF_DISABLED, "IPI", NULL);
592	595	get_irq_desc(irq_offset_up(XICS_IPI))->status \|= IRQ_PER_CPU;
593	596	}
594	597	#endif
...	...	@@ -167,7 +167,7 @@
167	167
168	168	static struct irqaction i8259_irqaction = {
169	169	.handler = no_action,
170		- .flags = SA_INTERRUPT,
	170	+ .flags = IRQF_DISABLED,
171	171	.mask = CPU_MASK_NONE,
172	172	.name = "82c59 secondary cascade",
173	173	};
...	...	@@ -540,7 +540,7 @@
540	540	* IPIs are marked IRQ_PER_CPU. This has the side effect of
541	541	* preventing the IRQ_PENDING/IRQ_INPROGRESS logic from
542	542	* applying to them. We EOI them late to avoid re-entering.
543		- * We mark IPI's with SA_INTERRUPT as they must run with
	543	+ * We mark IPI's with IRQF_DISABLED as they must run with
544	544	* irqs disabled.
545	545	*/
546	546	mpic_eoi(mpic);
547	547
548	548
549	549
...	...	@@ -1027,14 +1027,17 @@
1027	1027
1028	1028	printk("requesting IPIs ... \n");
1029	1029
1030		- /* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */
1031		- request_irq(mpic->ipi_offset+0, mpic_ipi_action, SA_INTERRUPT,
	1030	+ /*
	1031	+ * IPIs are marked IRQF_DISABLED as they must run with irqs
	1032	+ * disabled
	1033	+ */
	1034	+ request_irq(mpic->ipi_offset+0, mpic_ipi_action, IRQF_DISABLED,
1032	1035	"IPI0 (call function)", mpic);
1033		- request_irq(mpic->ipi_offset+1, mpic_ipi_action, SA_INTERRUPT,
	1036	+ request_irq(mpic->ipi_offset+1, mpic_ipi_action, IRQF_DISABLED,
1034	1037	"IPI1 (reschedule)", mpic);
1035		- request_irq(mpic->ipi_offset+2, mpic_ipi_action, SA_INTERRUPT,
	1038	+ request_irq(mpic->ipi_offset+2, mpic_ipi_action, IRQF_DISABLED,
1036	1039	"IPI2 (unused)", mpic);
1037		- request_irq(mpic->ipi_offset+3, mpic_ipi_action, SA_INTERRUPT,
	1040	+ request_irq(mpic->ipi_offset+3, mpic_ipi_action, IRQF_DISABLED,
1038	1041	"IPI3 (debugger break)", mpic);
1039	1042
1040	1043	printk("IPIs requested... \n");
...	...	@@ -27,7 +27,7 @@
27	27	#define fd_disable_irq() disable_irq(FLOPPY_IRQ)
28	28	#define fd_cacheflush(addr,size) /* nothing */
29	29	#define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt, \
30		- SA_INTERRUPT, "floppy", NULL)
	30	+ IRQF_DISABLED, "floppy", NULL)
31	31	#define fd_free_irq() free_irq(FLOPPY_IRQ, NULL);
32	32
33	33	#ifdef CONFIG_PCI
...	...	@@ -63,7 +63,6 @@
63	63	* SA_FLAGS values:
64	64	*
65	65	* SA_ONSTACK is not currently supported, but will allow sigaltstack(2).
66		- * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the
67	66	* SA_RESTART flag to get restarting signals (which were the default long ago)
68	67	* SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
69	68	* SA_RESETHAND clears the handler when the signal is delivered.
...	...	@@ -83,7 +82,6 @@
83	82
84	83	#define SA_NOMASK SA_NODEFER
85	84	#define SA_ONESHOT SA_RESETHAND
86		-#define SA_INTERRUPT 0x20000000u /* dummy -- ignored */
87	85
88	86	#define SA_RESTORER 0x04000000U
89	87