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

[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>

authored by

Thomas Gleixner and committed by
Linus Torvalds
b98d3396 bc2e2635

+4 -6
+2 -2
arch/h8300/kernel/ints.c
··· 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 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 {
+2 -2
arch/h8300/platform/h8s/ints.c
··· 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 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 {
-2
include/asm-h8300/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 #define SA_RESTORER 0x04000000 99 99