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

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

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

arch/m68knommu/platform/5307/pit.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ void coldfire_pit_init(irqreturn_t (*handler)(int, void *, struct pt_regs *)) 
	volatile unsigned char *icrp;

	volatile unsigned long *imrp;



	request_irq(MCFINT_VECBASE + MCFINT_PIT1, handler, SA_INTERRUPT,

	request_irq(MCFINT_VECBASE + MCFINT_PIT1, handler, IRQF_DISABLED,

		"ColdFire Timer", NULL);



	icrp = (volatile unsigned char *) (MCF_IPSBAR + MCFICM_INTC0 +

arch/m68knommu/platform/5307/timers.c

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ void coldfire_timer_init(irqreturn_t (*handler)(int, void *, struct pt_regs *)) 
	__raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |

		MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR));



	request_irq(mcf_timervector, handler, SA_INTERRUPT, "timer", NULL);

	request_irq(mcf_timervector, handler, IRQF_DISABLED, "timer", NULL);

	mcf_settimericr(1, mcf_timerlevel);



#ifdef CONFIG_HIGHPROFILE
@@ -125,7 +125,7 @@ void coldfire_profile_init(void) 
		MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, PA(MCFTIMER_TMR));



	request_irq(mcf_profilevector, coldfire_profile_tick,

		(SA_INTERRUPT | IRQ_FLG_FAST), "profile timer", NULL);

		(IRQF_DISABLED | IRQ_FLG_FAST), "profile timer", NULL);

	mcf_settimericr(2, 7);

}

include/asm-m68knommu/irq.h

+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ extern void (*mach_disable_irq)(unsigned int); 


/*

 * various flags for request_irq() - the Amiga now uses the standard

 * mechanism like all other architectures - SA_INTERRUPT and SA_SHIRQ

 * are your friends.

 * mechanism like all other architectures - IRQF_DISABLED and

 * IRQF_SHARED are your friends.

 */

#define IRQ_FLG_LOCK	(0x0001)	/* handler is not replaceable	*/

#define IRQ_FLG_REPLACE	(0x0002)	/* replace existing handler	*/

include/asm-m68knommu/signal.h

+0 −2
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ typedef unsigned long sigset_t; 
 * SA_FLAGS values:

 *

 * SA_ONSTACK indicates that a registered stack_t will be used.

 * 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.
@@ -94,7 +93,6 @@ typedef unsigned long sigset_t; 


#define SA_NOMASK	SA_NODEFER

#define SA_ONESHOT	SA_RESETHAND

#define SA_INTERRUPT	0x20000000 /* dummy -- ignored */



/* 

 * sigaltstack controls