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

[PATCH] irq-flags: M68KNOMMU: 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>
Cc: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Thomas Gleixner and committed by
Linus Torvalds
f6f23887 aff60147

+5 -7
+1 -1
arch/m68knommu/platform/5307/pit.c
··· 48 48 volatile unsigned char *icrp; 49 49 volatile unsigned long *imrp; 50 50 51 - request_irq(MCFINT_VECBASE + MCFINT_PIT1, handler, SA_INTERRUPT, 51 + request_irq(MCFINT_VECBASE + MCFINT_PIT1, handler, IRQF_DISABLED, 52 52 "ColdFire Timer", NULL); 53 53 54 54 icrp = (volatile unsigned char *) (MCF_IPSBAR + MCFICM_INTC0 +
+2 -2
arch/m68knommu/platform/5307/timers.c
··· 61 61 __raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 | 62 62 MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR)); 63 63 64 - request_irq(mcf_timervector, handler, SA_INTERRUPT, "timer", NULL); 64 + request_irq(mcf_timervector, handler, IRQF_DISABLED, "timer", NULL); 65 65 mcf_settimericr(1, mcf_timerlevel); 66 66 67 67 #ifdef CONFIG_HIGHPROFILE ··· 125 125 MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, PA(MCFTIMER_TMR)); 126 126 127 127 request_irq(mcf_profilevector, coldfire_profile_tick, 128 - (SA_INTERRUPT | IRQ_FLG_FAST), "profile timer", NULL); 128 + (IRQF_DISABLED | IRQ_FLG_FAST), "profile timer", NULL); 129 129 mcf_settimericr(2, 7); 130 130 } 131 131
+2 -2
include/asm-m68knommu/irq.h
··· 62 62 63 63 /* 64 64 * various flags for request_irq() - the Amiga now uses the standard 65 - * mechanism like all other architectures - SA_INTERRUPT and SA_SHIRQ 66 - * are your friends. 65 + * mechanism like all other architectures - IRQF_DISABLED and 66 + * IRQF_SHARED are your friends. 67 67 */ 68 68 #define IRQ_FLG_LOCK (0x0001) /* handler is not replaceable */ 69 69 #define IRQ_FLG_REPLACE (0x0002) /* replace existing handler */
-2
include/asm-m68knommu/signal.h
··· 74 74 * SA_FLAGS values: 75 75 * 76 76 * SA_ONSTACK indicates that a registered stack_t will be used. 77 - * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the 78 77 * SA_RESTART flag to get restarting signals (which were the default long ago) 79 78 * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. 80 79 * SA_RESETHAND clears the handler when the signal is delivered. ··· 93 94 94 95 #define SA_NOMASK SA_NODEFER 95 96 #define SA_ONESHOT SA_RESETHAND 96 - #define SA_INTERRUPT 0x20000000 /* dummy -- ignored */ 97 97 98 98 /* 99 99 * sigaltstack controls