iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] irq-flags: H8300: Use the new IRQF_ constants

Browse Source 
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>
This commit is contained in:
Thomas Gleixner 2006-07-01 19:29:15 -07:00 committed by Linus Torvalds
parent bc2e2635bd
commit b98d3396f6
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/h8300/kernel/ints.c
View File

@ -158,7 +158,7 @@ int request_irq(unsigned int irq,
irq_handle->devname = devname; irq_handle->devname = devname;
irq_list[irq] = irq_handle; irq_list[irq] = irq_handle;
if (irq_handle->flags & SA_SAMPLE_RANDOM) if (irq_handle->flags & IRQF_SAMPLE_RANDOM)
rand_initialize_irq(irq); rand_initialize_irq(irq);
enable_irq(irq); enable_irq(irq);
@ -222,7 +222,7 @@ asmlinkage void process_int(int irq, struct pt_regs *fp)
if (irq_list[irq]) { if (irq_list[irq]) {
irq_list[irq]->handler(irq, irq_list[irq]->dev_id, fp); irq_list[irq]->handler(irq, irq_list[irq]->dev_id, fp);
irq_list[irq]->count++; irq_list[irq]->count++;
if (irq_list[irq]->flags & SA_SAMPLE_RANDOM) if (irq_list[irq]->flags & IRQF_SAMPLE_RANDOM)
add_interrupt_randomness(irq); add_interrupt_randomness(irq);
} }
} else { } else {

4
arch/h8300/platform/h8s/ints.c
View File

@ -192,7 +192,7 @@ int request_irq(unsigned int irq,
irq_handle->dev_id = dev_id; irq_handle->dev_id = dev_id;
irq_handle->devname = devname; irq_handle->devname = devname;
irq_list[irq] = irq_handle; irq_list[irq] = irq_handle;
if (irq_handle->flags & SA_SAMPLE_RANDOM) if (irq_handle->flags & IRQF_SAMPLE_RANDOM)
rand_initialize_irq(irq); rand_initialize_irq(irq);
/* enable interrupt */ /* enable interrupt */
@ -270,7 +270,7 @@ asmlinkage void process_int(unsigned long vec, struct pt_regs *fp)
if (irq_list[vec]) { if (irq_list[vec]) {
irq_list[vec]->handler(vec, irq_list[vec]->dev_id, fp); irq_list[vec]->handler(vec, irq_list[vec]->dev_id, fp);
irq_list[vec]->count++; irq_list[vec]->count++;
if (irq_list[vec]->flags & SA_SAMPLE_RANDOM) if (irq_list[vec]->flags & IRQF_SAMPLE_RANDOM)
add_interrupt_randomness(vec); add_interrupt_randomness(vec);
} }
} else { } else {

2
include/asm-h8300/signal.h
View File

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