diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:46 -0400 |
commit | bc2e2635bd814dc893e45e866774883a0a66cd36 (patch) | |
tree | e9870d5b9d16a73fd1fea22fdc3c386a90631346 /include/asm-frv | |
parent | aa7135ff33bf697196f2a3104d93837096c63ff0 (diff) |
[PATCH] irq-flags: FRV: 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: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-frv')
-rw-r--r-- | include/asm-frv/irq-routing.h | 2 | ||||
-rw-r--r-- | include/asm-frv/signal.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-frv/irq-routing.h b/include/asm-frv/irq-routing.h index 686fb2b39d6a..ac3ab900a1dc 100644 --- a/include/asm-frv/irq-routing.h +++ b/include/asm-frv/irq-routing.h | |||
@@ -51,7 +51,7 @@ struct irq_source { | |||
51 | struct irq_level { | 51 | struct irq_level { |
52 | int usage; | 52 | int usage; |
53 | int disable_count; | 53 | int disable_count; |
54 | unsigned long flags; /* current SA_INTERRUPT and SA_SHIRQ settings */ | 54 | unsigned long flags; /* current IRQF_DISABLED and IRQF_SHARED settings */ |
55 | spinlock_t lock; | 55 | spinlock_t lock; |
56 | struct irq_source *sources; | 56 | struct irq_source *sources; |
57 | }; | 57 | }; |
diff --git a/include/asm-frv/signal.h b/include/asm-frv/signal.h index dcc1b3592918..2079197d483d 100644 --- a/include/asm-frv/signal.h +++ b/include/asm-frv/signal.h | |||
@@ -74,7 +74,6 @@ typedef unsigned long sigset_t; | |||
74 | * SA_FLAGS values: | 74 | * SA_FLAGS values: |
75 | * | 75 | * |
76 | * SA_ONSTACK indicates that a registered stack_t will be used. | 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 | * SA_RESTART flag to get restarting signals (which were the default long ago) | 77 | * SA_RESTART flag to get restarting signals (which were the default long ago) |
79 | * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. | 78 | * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. |
80 | * SA_RESETHAND clears the handler when the signal is delivered. | 79 | * SA_RESETHAND clears the handler when the signal is delivered. |
@@ -94,7 +93,6 @@ typedef unsigned long sigset_t; | |||
94 | 93 | ||
95 | #define SA_NOMASK SA_NODEFER | 94 | #define SA_NOMASK SA_NODEFER |
96 | #define SA_ONESHOT SA_RESETHAND | 95 | #define SA_ONESHOT SA_RESETHAND |
97 | #define SA_INTERRUPT 0x20000000 /* dummy -- ignored */ | ||
98 | 96 | ||
99 | #define SA_RESTORER 0x04000000 | 97 | #define SA_RESTORER 0x04000000 |
100 | 98 | ||