From 77d096ecc58842e58bd2d6a6826287910c610aa9 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 1 Jul 2006 19:29:15 -0700 Subject: [PATCH] --- yaml --- r: 31607 b: refs/heads/master c: b98d3396f69f047163b3a1dc2ffabb7402a244b2 h: refs/heads/master i: 31605: fd36b648e75e05c79bccf10f9c7530015c7933a4 31603: af3406574c153216a7e539c53011ae7623d668c0 31599: c740d5f5169cd0b8c18d0af147142b37e88e5c5b v: v3 --- [refs] | 2 +- trunk/arch/h8300/kernel/ints.c | 4 ++-- trunk/arch/h8300/platform/h8s/ints.c | 4 ++-- trunk/include/asm-h8300/signal.h | 2 -- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 243333215310..1aac30664cfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc2e2635bd814dc893e45e866774883a0a66cd36 +refs/heads/master: b98d3396f69f047163b3a1dc2ffabb7402a244b2 diff --git a/trunk/arch/h8300/kernel/ints.c b/trunk/arch/h8300/kernel/ints.c index edb3c4170013..1488b6ace18c 100644 --- a/trunk/arch/h8300/kernel/ints.c +++ b/trunk/arch/h8300/kernel/ints.c @@ -158,7 +158,7 @@ int request_irq(unsigned int irq, irq_handle->devname = devname; irq_list[irq] = irq_handle; - if (irq_handle->flags & SA_SAMPLE_RANDOM) + if (irq_handle->flags & IRQF_SAMPLE_RANDOM) rand_initialize_irq(irq); enable_irq(irq); @@ -222,7 +222,7 @@ asmlinkage void process_int(int irq, struct pt_regs *fp) if (irq_list[irq]) { irq_list[irq]->handler(irq, irq_list[irq]->dev_id, fp); irq_list[irq]->count++; - if (irq_list[irq]->flags & SA_SAMPLE_RANDOM) + if (irq_list[irq]->flags & IRQF_SAMPLE_RANDOM) add_interrupt_randomness(irq); } } else { diff --git a/trunk/arch/h8300/platform/h8s/ints.c b/trunk/arch/h8300/platform/h8s/ints.c index f6ed663bdde0..270440de4610 100644 --- a/trunk/arch/h8300/platform/h8s/ints.c +++ b/trunk/arch/h8300/platform/h8s/ints.c @@ -192,7 +192,7 @@ int request_irq(unsigned int irq, irq_handle->dev_id = dev_id; irq_handle->devname = devname; irq_list[irq] = irq_handle; - if (irq_handle->flags & SA_SAMPLE_RANDOM) + if (irq_handle->flags & IRQF_SAMPLE_RANDOM) rand_initialize_irq(irq); /* enable interrupt */ @@ -270,7 +270,7 @@ asmlinkage void process_int(unsigned long vec, struct pt_regs *fp) if (irq_list[vec]) { irq_list[vec]->handler(vec, irq_list[vec]->dev_id, fp); irq_list[vec]->count++; - if (irq_list[vec]->flags & SA_SAMPLE_RANDOM) + if (irq_list[vec]->flags & IRQF_SAMPLE_RANDOM) add_interrupt_randomness(vec); } } else { diff --git a/trunk/include/asm-h8300/signal.h b/trunk/include/asm-h8300/signal.h index 8eccdc176163..7bc15048a64f 100644 --- a/trunk/include/asm-h8300/signal.h +++ b/trunk/include/asm-h8300/signal.h @@ -74,7 +74,6 @@ typedef unsigned long sigset_t; * SA_FLAGS values: * * 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_NOCLDSTOP flag to turn off SIGCHLD when children stop. * 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_ONESHOT SA_RESETHAND -#define SA_INTERRUPT 0x20000000 /* dummy -- ignored */ #define SA_RESTORER 0x04000000