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

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

[PATCH] irq-flags: XTENSA: 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: Chris Zankel <chris@zankel.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b1e05aa2

arch/xtensa/kernel/time.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ unsigned long long sched_clock(void) 
static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs);

static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs);

static struct irqaction timer_irqaction = {

static struct irqaction timer_irqaction = {

	.handler =	timer_interrupt,

	.handler =	timer_interrupt,

	.flags =	SA_INTERRUPT,

	.flags =	IRQF_DISABLED,

	.name =		"timer",

	.name =		"timer",

};

};

include/asm-xtensa/signal.h

+0 −15
Original line number Original line Diff line number Diff line
@@ -75,7 +75,6 @@ typedef struct { 
 * SA_FLAGS values:

 * SA_FLAGS values:

 *

 *

 * SA_ONSTACK indicates that a registered stack_t will be used.

 * 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_RESTART flag to get restarting signals (which were the default long ago)

 * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.

 * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.

 * SA_RESETHAND clears the handler when the signal is delivered.

 * SA_RESETHAND clears the handler when the signal is delivered.
@@ -95,7 +94,6 @@ typedef struct { 




#define SA_NOMASK	SA_NODEFER

#define SA_NOMASK	SA_NODEFER

#define SA_ONESHOT	SA_RESETHAND

#define SA_ONESHOT	SA_RESETHAND

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





#define SA_RESTORER	0x04000000

#define SA_RESTORER	0x04000000
@@ -109,19 +107,6 @@ typedef struct { 
#define SIGSTKSZ	8192

#define SIGSTKSZ	8192





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__

#ifdef __KERNEL__



/*

 * These values of sa_flags are used only by the kernel as part of the

 * irq handling routines.

 *

 * SA_INTERRUPT is also used by the irq handling routines.

 * SA_SHIRQ is for shared interrupt support on PCI and EISA.

 */

#define SA_SAMPLE_RANDOM	SA_RESTART

#define SA_SHIRQ		0x04000000

#define SA_PROBEIRQ		0x08000000

#endif





#define SIG_BLOCK          0	/* for blocking signals */

#define SIG_BLOCK          0	/* for blocking signals */

#define SIG_UNBLOCK        1	/* for unblocking signals */

#define SIG_UNBLOCK        1	/* for unblocking signals */