Commit b98d3396f69f047163b3a1dc2ffabb7402a244b2

Authored by Thomas Gleixner
Committed by Linus Torvalds
1 parent bc2e2635bd

[PATCH] irq-flags: H8300: 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: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 3 changed files with 4 additions and 6 deletions Side-by-side Diff

arch/h8300/kernel/ints.c
... ... @@ -158,7 +158,7 @@
158 158 irq_handle->devname = devname;
159 159 irq_list[irq] = irq_handle;
160 160  
161   - if (irq_handle->flags & SA_SAMPLE_RANDOM)
  161 + if (irq_handle->flags & IRQF_SAMPLE_RANDOM)
162 162 rand_initialize_irq(irq);
163 163  
164 164 enable_irq(irq);
... ... @@ -222,7 +222,7 @@
222 222 if (irq_list[irq]) {
223 223 irq_list[irq]->handler(irq, irq_list[irq]->dev_id, fp);
224 224 irq_list[irq]->count++;
225   - if (irq_list[irq]->flags & SA_SAMPLE_RANDOM)
  225 + if (irq_list[irq]->flags & IRQF_SAMPLE_RANDOM)
226 226 add_interrupt_randomness(irq);
227 227 }
228 228 } else {
arch/h8300/platform/h8s/ints.c
... ... @@ -192,7 +192,7 @@
192 192 irq_handle->dev_id = dev_id;
193 193 irq_handle->devname = devname;
194 194 irq_list[irq] = irq_handle;
195   - if (irq_handle->flags & SA_SAMPLE_RANDOM)
  195 + if (irq_handle->flags & IRQF_SAMPLE_RANDOM)
196 196 rand_initialize_irq(irq);
197 197  
198 198 /* enable interrupt */
... ... @@ -270,7 +270,7 @@
270 270 if (irq_list[vec]) {
271 271 irq_list[vec]->handler(vec, irq_list[vec]->dev_id, fp);
272 272 irq_list[vec]->count++;
273   - if (irq_list[vec]->flags & SA_SAMPLE_RANDOM)
  273 + if (irq_list[vec]->flags & IRQF_SAMPLE_RANDOM)
274 274 add_interrupt_randomness(vec);
275 275 }
276 276 } else {
include/asm-h8300/signal.h
... ... @@ -74,7 +74,6 @@
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.
... ... @@ -94,7 +93,6 @@
94 93  
95 94 #define SA_NOMASK SA_NODEFER
96 95 #define SA_ONESHOT SA_RESETHAND
97   -#define SA_INTERRUPT 0x20000000 /* dummy -- ignored */
98 96  
99 97 #define SA_RESTORER 0x04000000
100 98